Commit Graph

7566 Commits

Author SHA1 Message Date
Brad King
a152e97e23 Merge topic 'UseEcos-update'
47732280 UseEcos: Fix for separate <DEFINES> and <INCLUDES> placeholders

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !871
2017-05-22 10:35:59 -04:00
Brad King
561e5edc3c Merge topic 'FindProtobuf-targets'
37627217 Help: Add notes for topic 'FindProtobuf-targets'
e4e1d194 FindProtobuf: add tests
f29635b6 FindProtobuf: add targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !861
2017-05-19 14:17:50 -04:00
Florian Schmaus
4773228061 UseEcos: Fix for separate <DEFINES> and <INCLUDES> placeholders
Update the module to account for commit v3.4.0-rc1~342^2 (Factor an
<INCLUDES> placeholder out of <FLAGS> in rule variables, 2015-07-13)
and v2.6.0~537 (Create COMPILE_DEFINITIONS property for targets and
source files, 2008-01-14).

Fixes: #16904
2017-05-19 10:51:09 -04:00
Brad King
bc7d64f896 Merge topic 'string-append'
9e24af01 Use string(APPEND) in Modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !864
2017-05-18 09:03:40 -04:00
Brad King
44f8f839cb Merge topic 'cpack-archive-per-component-filename'
9e06e97d CPack/Archive: per component filenames support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !859
2017-05-18 09:01:57 -04:00
Brad King
21916a4784 Merge topic 'vs14-GNUtoMS'
c02d4d2a GNUtoMS: Add search path for VS 2015 environment scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !854
2017-05-18 08:53:23 -04:00
Brad King
6b1e35d207 Merge topic 'gtest_add_tests'
6edd1806 GoogleTest: Expand capabilities of gtest_add_tests()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !839
2017-05-18 08:46:02 -04:00
André Apitzsch
f29635b667 FindProtobuf: add targets 2017-05-18 13:57:01 +02:00
Daniel Pfeifer
9e24af0137 Use string(APPEND) in Modules
Automate with:

find Modules -type f -print0 | xargs -0 perl -i -0pe \
  's/set\(([a-zA-Z0-9_\$\{\}]+)(\s+)"\$\{\1\}([^"])/string(APPEND \1\2"\3/g'
2017-05-17 11:26:11 -06:00
Alex Ghosh
c02d4d2aee GNUtoMS: Add search path for VS 2015 environment scripts 2017-05-17 11:19:23 -04:00
Domen Vrankar
9e06e97d30 CPack/Archive: per component filenames support
Support for setting archive packager specific
per component filenames and monolithic package
filenames.
2017-05-17 00:47:15 +02:00
Brad King
ef8ac5ad5a Merge topic 'cpackifw-i18n'
72ac7ad9 CPackIFW: Internationalization Support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !748
2017-05-16 09:55:29 -04:00
Brad King
0789a8be08 Merge topic 'extra-fphsa-space'
3c515e19 FPHSA: remove extra space

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !843
2017-05-16 09:54:09 -04:00
Brad King
80e0ef4082 Merge topic 'GNU-FindBinUtils-patterns'
75accaae GCC: more patterns for ar/ranlib

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !838
2017-05-16 09:53:32 -04:00
Brad King
252c2f5ee2 Merge topic 'vs_fix_cpp_debugging_with_cs_enabled'
a6b39a5a VS: Fix debugging of C++ executables if CSharp is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !844
2017-05-16 09:51:51 -04:00
Brad King
300979e788 Merge topic 'FindOpenSSL-crypto-only'
8b410453 FindOpenSSL: Restore support for crypto-only result

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !846
2017-05-16 09:49:05 -04:00
Brad King
46f48467c5 Merge topic 'FindDevIL-compat'
e8f0385f FindDevIL: Restore IL_FOUND result variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !845
2017-05-16 09:47:50 -04:00
Craig Scott
6edd1806dd GoogleTest: Expand capabilities of gtest_add_tests()
Now has keyword-based arguments (old syntax form is still supported).
Discovered tests can have a prefix and/or suffix added to the test names
and the list of discovered tests is available to the caller. The working
dir can also be set and the dependency on the source files is now
optional instead of mandatory.
2017-05-16 07:57:27 +10:00
Michael Stürmer
a6b39a5adf VS: Fix debugging of C++ executables if CSharp is enabled
Fixes: #16867
2017-05-15 11:02:15 -04:00
Brad King
cda0baea49 Merge topic 'FindPkgConfig-fix-lib-search'
2e293c39 FindPkgConfig: Fix pkg_check_modules() non-standard location search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !835
2017-05-15 10:55:10 -04:00
Brad King
8b41045393 FindOpenSSL: Restore support for crypto-only result
Since commit v3.8.0-rc1~132^2 (FindOpenSSL: Check that both CRYPTO and
SSL libraries are present, 2017-01-03) we require both crypto and ssl
libraries to be present.  This makes sense because `OPENSSL_LIBRARIES`
lists both and breaks when one is not found.  However, prior to that
fix we supported finding only the crypto library and using it through
the imported target.  Drop the requirement for ssl to restore support
for using crypto alone.

Later this module should be taught to support the `COMPONENTS` argument
of `find_package`.

Fixes: #16882
2017-05-15 10:12:46 -04:00
Brad King
e8f0385f41 FindDevIL: Restore IL_FOUND result variable
The fix in commit v3.8.0-rc1~257^2~1 (FindDevIL: fail properly when
library is not found, 2016-11-24) removed the previously-provided
`IL_FOUND` result variable.  Set it for compatibility and update the
documentation to mention the new variable.

Fixes: #16881
2017-05-15 09:56:41 -04:00
Ben Boeckel
3c515e1922 FPHSA: remove extra space
Each missing variable is added to the string as " ${var}" which causes
the string to always have a leading space. Remove the duplicate space
due to this in the output.
2017-05-15 09:23:29 -04:00
Ruslan Baratov
75accaae8b GCC: more patterns for ar/ranlib 2017-05-14 12:31:26 +03:00
Konstantin Podsvirov
72ac7ad98d CPackIFW: Internationalization Support
Changes:
- DISPLAY_NAME and DESCRIPTION in CPackIFW module now is MULTI_ARGS;
- Added internationalization support for DisplayName and Description
  properties in cmCPackIFWPackage class;
- Added documentation to CPackIFW module;
- Added release note.
2017-05-13 02:34:15 +03:00
Yuriy Khokhulya
2e293c39da FindPkgConfig: Fix pkg_check_modules() non-standard location search
During search of the library file `pkg_check_modules()` attempts to find
it in last specified library path in `${_prefix}_LDFLAGS`, that after
dependency resolving contains path to standard location.

So in case when `${_prefix}_LDFLAGS` has:

    -L/prefix;-L/usr/local/lib;-llibrary_from_prefix;-ldependency

`library_from_prefix` will not be found.

As solution need try to find the library in all paths preceding to the
library.

Fixes: #16873
2017-05-12 09:21:21 -04:00
Brad King
793b223c02 Merge topic 'getprerequisites-fix'
e0e414d6 GetPrerequisites: Only recurse on resolved unseen prerequisites

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !804
2017-05-12 09:13:37 -04:00
Brad King
592206a157 Merge topic 'add_cuda_cxx14_flag'
036ffe81 CUDA: Add support for the C++14 standard flag.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !830
2017-05-12 09:13:19 -04:00
Guillaume Dumont
e0e414d659 GetPrerequisites: Only recurse on resolved unseen prerequisites
I encountered an issue where not all prerequisites would be listed by
`get_prerequisites` since some of the prerequisites cannot be resolved
and are added to the list of unseen prerequisites.  This has the side
effect of clearing the list of `prerequisites_var` and thus removes some
prerequisites from the list.  Fix it.
2017-05-11 16:12:38 -04:00
Brad King
5d13fe2822 Features: Record features for SunPro C 5.13 and 5.14 2017-05-11 15:59:48 -04:00
Robert Maynard
036ffe815a CUDA: Add support for the C++14 standard flag.
CUDA 9 toolkit has announced support for C++14 flag, so lets allow users
to use it.
2017-05-11 13:42:42 -04:00
Brad King
20c838da6b Merge topic 'sunpro-fpp-fix'
1cd40bd2 SunPro: Use -fpp to process all files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !826
2017-05-11 09:59:47 -04:00
Christian Pfeiffer
1cd40bd226 SunPro: Use -fpp to process all files
By using only -F, SunPro does not process files that don't have a .F or
.F90 extension. This means that the preprocess rules don't quite work as
expected, for instance breaking the Ninja generator's behavior during
cmake_ninja_depends.
2017-05-10 19:33:48 +02:00
Chuck Atkins
67c9f47901 PGI: Fix typo in compiler version test for language standards 2017-05-10 12:25:44 -05:00
Brad King
8cc9e07a2c Merge topic 'sunpro-c++11-link'
d49aa107 Features: On SunPro link feature check with lang std flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !818
2017-05-10 09:36:16 -04:00
Brad King
d49aa10768 Features: On SunPro link feature check with lang std flag
Follow up commit e17b179184 (Features: On SunPro link with language
standard compiler flag, 2017-04-28) to apply the same fix to the feature
checks.  The `try_compile` used for these is intentionally not using
`CXX_STANDARD`-based logic so that it can test the individual flags.
2017-05-09 11:22:18 -04:00
Christian Pfeiffer
80ca9ac84b FindOpenMP: Cache compilation results 2017-05-08 18:52:48 +02:00
Christian Pfeiffer
ec5c6bc9bc FindOpenMP: Refine list of flags to try 2017-05-08 18:26:17 +02:00
Brad King
141b8ccf2c Merge topic 'f2c-int-fix'
93f119ed FortranCInterface: Add support for PGI on Windows
2cfea104 FortranCInt: Pass CONFIG flags to try_compile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !802
2017-05-08 09:54:11 -04:00
Brad King
0361ca52f6 Merge topic 'nag-fortran-version'
d47190ba NAG: Detect compiler version of NAG Fortran
d52a4256 NAG: Extend compiler tool selection with NAG Fortran

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: Tom <tom.clune@nasa.gov>
Merge-request: !809
2017-05-08 09:50:20 -04:00
Brad King
b05688db47 Merge topic 'pgi-rdynamic-fix'
fb31229e Linux-PGI: Prevent -rdynamic ending up in flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !808
2017-05-08 09:49:12 -04:00
Brad King
2f087606b7 Merge topic 'pgi-fix-linux'
d59e3509 Do not assume GCC libs are linked by all compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !800
2017-05-08 09:48:19 -04:00
Brad King
9fe8abbe03 Merge topic 'FindOpenCL-AMDAPPSDKROOT'
b259fe84 FindOpenCL: Add missing PATHS keyword

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !807
2017-05-08 09:47:35 -04:00
Christian Pfeiffer
93f119ed25 FortranCInterface: Add support for PGI on Windows 2017-05-06 16:36:33 +02:00
Christian Pfeiffer
2cfea104a6 FortranCInt: Pass CONFIG flags to try_compile
This change ensures that Intel Fortran's /libs: in
CMAKE_Fortran_FLAGS and Visual C++'s /MT or /MD in the
CMAKE_C_FLAGS_RELEASE do not conflict with each other.
2017-05-06 16:36:24 +02:00
Christian Pfeiffer
fb31229e99 Linux-PGI: Prevent -rdynamic ending up in flags
Ensure that PGI on Linux keeps its
CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS empty, especially of -rdynamic.
In CMakeFortranInformation a lot of flags will be copied from their C
equivalents if they're not defined. By using a combination of GCC and
PGFortran, this will lead to -rdynamic ending up in the PGI flags and
none of the PGI compilers understand that flag, crashing with a fatal
error.
2017-05-05 17:30:11 +02:00
Christian Pfeiffer
d59e350985 Do not assume GCC libs are linked by all compilers
Not all compilers link libgcc and libgcc_s causing trouble when linking
C++ code with instance PGI Fortran and C compilers.
2017-05-05 17:26:29 +02:00
Tom Clune
d47190ba46 NAG: Detect compiler version of NAG Fortran
Fixes: #16817
2017-05-05 11:08:37 -04:00
Tom Clune
d52a4256b2 NAG: Extend compiler tool selection with NAG Fortran
Add `nag` and `nagfor`.
2017-05-05 10:31:09 -04:00
Kirill Mavreshko
b259fe84ab FindOpenCL: Add missing PATHS keyword
The change in commit b888104e44 (FindOpenCL: add AMDAPPSDKROOT into
paths for OpenCL library, 2017-05-03) accidentally left out the `PATHS`
keyword.  Without it properly installed AMD APP SDK (OpenCL) cannot be
detected.  Tested on Ubuntu 16.04.
2017-05-05 10:19:19 -04:00