summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'pgi-fix-windows'Brad King2017-05-226-5/+78
|\ | | | | | | | | | | | | | | | | 4eb15824 Windows-PGI: Add platform definitions a94ae96e Windows-PGI: Adapt default compiler flags c2c2d366 ImplicitLinkInfo: Add support for PGI on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !794
| * Windows-PGI: Add platform definitionsChristian Pfeiffer2017-05-204-0/+56
| | | | | | | | | | | | | | PGI on Windows should use the Visual C++ linker and librarian and not the ar provided for legacy reasons. The compiler parameters themselves are the same as their Linux parameters and not compatible to MSVC however.
| * Windows-PGI: Adapt default compiler flagsChristian Pfeiffer2017-05-201-1/+9
| | | | | | | | | | | | PGI demands -Bdynamic (/MD equivalent) for linking together dynamic libraries, so we should make it our default mirroring the settings of e.g. Visual C++ and Intel C++.
| * ImplicitLinkInfo: Add support for PGI on WindowsChristian Pfeiffer2017-05-201-4/+13
| | | | | | | | | | | | | | Since PGI does not write linker directives into objects, the necessary libraries have to be parsed from commandline. PGI does however link the Visual C++ runtime libraries, so they have to be filtered out to ensure no collision with settings of other languages can occur.
* | Merge topic 'UseEcos-update'Brad King2017-05-221-2/+2
|\ \ | | | | | | | | | | | | | | | | | | 47732280 UseEcos: Fix for separate <DEFINES> and <INCLUDES> placeholders Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !871
| * | UseEcos: Fix for separate <DEFINES> and <INCLUDES> placeholdersFlorian Schmaus2017-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'FindProtobuf-targets'Brad King2017-05-191-0/+81
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 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
| * | FindProtobuf: add targetsAndré Apitzsch2017-05-181-0/+81
| | |
* | | Merge topic 'string-append'Brad King2017-05-1813-28/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9e24af01 Use string(APPEND) in Modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !864
| * | | Use string(APPEND) in ModulesDaniel Pfeifer2017-05-1713-28/+28
| |/ / | | | | | | | | | | | | | | | | | | 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'
* | | Merge topic 'cpack-archive-per-component-filename'Brad King2017-05-181-0/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9e06e97d CPack/Archive: per component filenames support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !859
| * | | CPack/Archive: per component filenames supportDomen Vrankar2017-05-161-0/+39
| |/ / | | | | | | | | | | | | | | | Support for setting archive packager specific per component filenames and monolithic package filenames.
* | | Merge topic 'vs14-GNUtoMS'Brad King2017-05-181-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c02d4d2a GNUtoMS: Add search path for VS 2015 environment scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !854
| * | | GNUtoMS: Add search path for VS 2015 environment scriptsAlex Ghosh2017-05-171-0/+2
| | | |
* | | | Merge topic 'gtest_add_tests'Brad King2017-05-181-26/+149
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 6edd1806 GoogleTest: Expand capabilities of gtest_add_tests() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !839
| * | | GoogleTest: Expand capabilities of gtest_add_tests()Craig Scott2017-05-151-26/+149
| | |/ | |/| | | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'cpackifw-i18n'Brad King2017-05-161-9/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 72ac7ad9 CPackIFW: Internationalization Support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !748
| * | | CPackIFW: Internationalization SupportKonstantin Podsvirov2017-05-121-9/+37
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'extra-fphsa-space'Brad King2017-05-161-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3c515e19 FPHSA: remove extra space Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !843
| * | | FPHSA: remove extra spaceBen Boeckel2017-05-151-2/+2
| |/ / | | | | | | | | | | | | | | | 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.
* | | Merge topic 'GNU-FindBinUtils-patterns'Brad King2017-05-161-2/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 75accaae GCC: more patterns for ar/ranlib Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !838
| * | | GCC: more patterns for ar/ranlibRuslan Baratov2017-05-141-2/+10
| |/ /
* | | Merge topic 'vs_fix_cpp_debugging_with_cs_enabled'Brad King2017-05-161-11/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a6b39a5a VS: Fix debugging of C++ executables if CSharp is enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !844
| * | | VS: Fix debugging of C++ executables if CSharp is enabledMichael Stürmer2017-05-151-11/+11
| | |/ | |/| | | | | | | Fixes: #16867
* | | Merge topic 'FindOpenSSL-crypto-only'Brad King2017-05-161-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8b410453 FindOpenSSL: Restore support for crypto-only result Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !846
| * | | FindOpenSSL: Restore support for crypto-only resultBrad King2017-05-151-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'FindDevIL-compat'Brad King2017-05-161-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e8f0385f FindDevIL: Restore IL_FOUND result variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !845
| * | | FindDevIL: Restore IL_FOUND result variableBrad King2017-05-151-1/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'FindMatlab-2017a' into releaseBrad King2017-05-011-0/+1
| |\ \
| * \ \ Merge branch 'FindBoost-backport-fixes' into releaseBrad King2017-04-241-14/+42
| |\ \ \
| | * | | FindBoost: Support prebuilt Windows binaries from SourceForgeRoger Leigh2017-04-241-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This are searched for in the default installed location C:/local/boost_${ver} Cherry picked from commit 862482df274121e6f80dca925fb01d996710ed5e for backport to CMake 3.8.
| | * | | FindBoost: Allow testing for multiple compiler suffixesRoger Leigh2017-04-241-12/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to permit VS2017 to make use of the vc141 suffix or fall back to the compatible vc140 to use Boost libraries built with VS2015. Cherry picked from commit 3ca6f70f8b27c08ad3470542705701e6e8e6ea05 plus a fixup from commit 6115875bf0faef61c558e46395e67bdfd4ad48e1 for backport to CMake 3.8.
| | * | | FindBoost: Fix library directory for VS 2017Brad King2017-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | Boost 1.64 now names the library directory `14.1`, not `15.0`.
| * | | | Merge branch 'cpack-rpm-buildrequires-docs' into releaseBrad King2017-04-201-0/+13
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'FindBoost-fix-backslash-tolerance' into releaseBrad King2017-04-191-2/+3
| |\ \ \ \
* | \ \ \ \ Merge topic 'FindPkgConfig-fix-lib-search'Brad King2017-05-151-1/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e293c39 FindPkgConfig: Fix pkg_check_modules() non-standard location search Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !835
| * | | | | FindPkgConfig: Fix pkg_check_modules() non-standard location searchYuriy Khokhulya2017-05-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge topic 'getprerequisites-fix'Brad King2017-05-121-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0e414d6 GetPrerequisites: Only recurse on resolved unseen prerequisites Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !804
| * | | | | | GetPrerequisites: Only recurse on resolved unseen prerequisitesGuillaume Dumont2017-05-111-1/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge topic 'add_cuda_cxx14_flag'Brad King2017-05-121-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 036ffe81 CUDA: Add support for the C++14 standard flag. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !830
| * | | | | | CUDA: Add support for the C++14 standard flag.Robert Maynard2017-05-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CUDA 9 toolkit has announced support for C++14 flag, so lets allow users to use it.
* | | | | | | Features: Record features for SunPro C 5.13 and 5.14Brad King2017-05-112-0/+29
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'sunpro-fpp-fix'Brad King2017-05-111-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1cd40bd2 SunPro: Use -fpp to process all files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !826
| * | | | | | SunPro: Use -fpp to process all filesChristian Pfeiffer2017-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | PGI: Fix typo in compiler version test for language standardsChuck Atkins2017-05-101-1/+1
|/ / / / / /
* | | | | | Merge topic 'sunpro-c++11-link'Brad King2017-05-101-0/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d49aa107 Features: On SunPro link feature check with lang std flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !818
| * | | | | | Features: On SunPro link feature check with lang std flagBrad King2017-05-091-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | FindOpenMP: Cache compilation resultsChristian Pfeiffer2017-05-081-12/+10
| | | | | | |
* | | | | | | FindOpenMP: Refine list of flags to tryChristian Pfeiffer2017-05-081-5/+10
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'f2c-int-fix'Brad King2017-05-084-6/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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