summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-rc-defines'Brad King2017-04-101-0/+4
|\ | | | | | | | | | | | | 89b92a98 RC: Mark CMAKE_RC_FLAGS_<CONFIG> cache entries as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !685
| * RC: Mark CMAKE_RC_FLAGS_<CONFIG> cache entries as advancedBrad King2017-04-101-0/+4
| | | | | | | | | | | | These were added by commit v3.8.0-rc4~4^2~1 (RC: Add missing CMAKE_RC_FLAGS_<CONFIG> entries to cache, 2017-03-28) and should be advanced as they are for other languages.
* | Merge topic 'FindwxWidgets-new-syslibs'Brad King2017-04-101-1/+1
|\ \ | | | | | | | | | | | | | | | | | | ae4b3b70 FindwxWidgets: link with the new required libs under MSW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !676
| * | FindwxWidgets: link with the new required libs under MSWVadim Zeitlin2017-04-071-1/+1
| | | | | | | | | | | | | | | | | | Latest wxWidgets git master version and the upcoming 3.1.1 release requires linking with shlwapi and version DLLs. As this does no harm when using the previous versions, just do it unconditionally.
| * | Merge branch 'mac-implicit-link-no-lto-flag' into releaseBrad King2017-04-031-1/+9
| |\ \
| * \ \ Merge branch 'intel-compile-features' into releaseBrad King2017-03-311-1/+3
| |\ \ \
* | \ \ \ Merge topic 'multi-config-no-build-type'Brad King2017-04-073-6/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8187b884 Do not initialize CMAKE_BUILD_TYPE on multi-config generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !666
| * | | | | Do not initialize CMAKE_BUILD_TYPE on multi-config generatorsBastien Schatt2017-04-063-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the `GENERATOR_IS_MULTI_CONFIG` global property to reliably detect multi-config generators regardless of what variables the project or user have set.
* | | | | | FindBoost: Fix release name candidate list constructionyume todo2017-04-061-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in commit 3ca6f70f (FindBoost: Allow testing for multiple compiler suffixes, 2017-03-28) accidentally left a `set()` instead of a `list(APPEND)` while constructing `_boost_RELEASE_NAMES`. Fix the logic to match what was done for `_boost_DEBUG_NAMES`. Otherwise we drop some of the candidate names.
* | | | | Merge topic 'cpack-wix-root'Brad King2017-04-051-15/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fde8dfa4 CPackWIX: Add documentation for CPACK_WIX_ROOT fb22ba63 CPackWIX: Fix variable documentation indentations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !665
| * | | | | CPackWIX: Add documentation for CPACK_WIX_ROOTNils Gladitz2017-04-041-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16774
| * | | | | CPackWIX: Fix variable documentation indentationsNils Gladitz2017-04-041-15/+15
| | | | | |
* | | | | | Merge topic 'revert-cpack_nsis_sign_uninstaller'Brad King2017-04-052-49/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b1ad2a2 Revert "CPack/NSIS: Sign the uninstaller" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !597
| * | | | | | Revert "CPack/NSIS: Sign the uninstaller"Brad King2017-04-042-49/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 09475c29 (CPack/NSIS: Sign the uninstaller, 2017-03-01) and follow-up commit e1ee7b43 (CPack/NSIS: Avoid a race condition when generating the installer, 2017-03-22). The signing implementation does not work on Linux for a couple reasons: * The script tries to run the temporary uninstaller executable, but of course this cannot be done except on a Windows host. * The `${NSISDIR}\makensis` file does not exist because `makensis` is installed elsewhere. The result is that existing package configurations can break on Linux. For example, the CPackComponents test fails. Revert the feature until an alternative implementation approach can be found.
* | | | | | Merge topic 'FindCUDA-tll-keywords'Brad King2017-04-051-7/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f41bfd7 FindCUDA: Add option to use modern form of target_link_libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !663
| * | | | | | FindCUDA: Add option to use modern form of target_link_librariesTaylor Braun-Jones2017-04-041-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the option CUDA_LINK_LIBRARIES_KEYWORD which can be set to PRIVATE, PUBLIC, or INTERFACE or left empty (the default) to use the old form of target_link_libraries internally in FindCUDA macros. Fixes: #16772
* | | | | | | Merge topic 'CheckIPOSupported-Fortran'Brad King2017-04-054-7/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87199ea6 CheckIPOSupported: Add Fortran support c92fd256 CheckIPOSupported: Move '_CMakeLTOTest-*' under 'CMakeFiles' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !655
| * | | | | | | CheckIPOSupported: Add Fortran supportRuslan Baratov2017-04-044-6/+16
| | | | | | | |
| * | | | | | | CheckIPOSupported: Move '_CMakeLTOTest-*' under 'CMakeFiles'Ruslan Baratov2017-04-041-1/+1
| |/ / / / / /
* | | | | | | Merge topic 'lang-specific-binutils'Brad King2017-04-057-13/+17
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73934188 Rename CMAKE_GCC_{AR,RANLIB} to CMAKE_LANG_COMPILER_{AR,RANLIB} Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !656
| * | | | | | Rename CMAKE_GCC_{AR,RANLIB} to CMAKE_LANG_COMPILER_{AR,RANLIB}Ruslan Baratov2017-04-037-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variables recently added by commit b9d36826 (Add 'CMAKE_GCC_AR' and 'CMAKE_GCC_RANLIB' variables, 2017-03-08) are more appropriately managed with language-specific names rather than toolchain-specific names.
* | | | | | | Merge topic 'ExternalProject-checkout-clarify'Brad King2017-04-041-4/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12a78130 ExternalProject: Run `git checkout` with `--` to clarify arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !660
| * | | | | | | ExternalProject: Run `git checkout` with `--` to clarify argumentsBrad King2017-04-031-4/+10
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the case when the tag name to be checked out also happens to match a path name. Unfortunately we cannot do this for Git versions prior to 1.8.5 because they do not "do what I mean" to checkout remote branches when the `--` argument is given. Fixes: #16678
* | | | | | | Merge topic 'FindBoost-vs-toolset-fallback'Brad King2017-04-041-13/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 862482df FindBoost: Support prebuilt Windows binaries from SourceForge 3ca6f70f FindBoost: Allow testing for multiple compiler suffixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !639
| * | | | | | | FindBoost: Support prebuilt Windows binaries from SourceForgeRoger Leigh2017-03-291-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This are searched for in the default installed location C:/local/boost_${ver}
| * | | | | | | FindBoost: Allow testing for multiple compiler suffixesRoger Leigh2017-03-291-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. Fixes: #16631
* | | | | | | | Merge topic 'mac-implicit-link-no-lto-flag'Brad King2017-04-041-1/+9
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53f17333 CMakeParseImplicitLinkInfo: Ignore ld -lto_library flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !658
| * | | | | | | CMakeParseImplicitLinkInfo: Ignore ld -lto_library flagBrad King2017-04-031-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ld` tool in Xcode 8.3 now has a `-lto_library <path>` flag. Ignore the flag instead of accidentally parsing it as `-l` with `to_library`. Fixes: #16766
* | | | | | | | Merge topic 'xcode-current-arch'Brad King2017-04-046-1/+17
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1221905 Xcode: Detect CURRENT_ARCH for use by generator Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !648
| * | | | | | | Xcode: Detect CURRENT_ARCH for use by generatorBrad King2017-03-316-1/+17
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During compiler identification, extract the Xcode `CURRENT_ARCH` value and save it for later use by the Xcode generator in an internal compiler information variable. This will be useful to know the locations of object files when only one architecture is built.
* | | | | | | Merge topic 'ExternalProject-fix-remote-branch'Brad King2017-04-031-1/+4
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f3838c0 ExternalProject: Fix regression in GIT_TAG with remote branch name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !649
| * | | | | | ExternalProject: Fix regression in GIT_TAG with remote branch nameBrad King2017-03-311-1/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.8.0-rc2~7^2 (ExternalProject: Run `git checkout` with `--` to clarify arguments, 2017-02-24) broke the case of `GIT_TAG some-remote-branch` because an explicit `--` means that the preceding argument is a tree-ish instead of a branch. Revert the change and leave a comment. Fixes: #16763
* | | | | | Merge topic 'intel-compile-features'Brad King2017-04-031-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | 4af0c9da Features: Update features for Intel C++ 17.0.2 on UNIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !652
| * | | | Features: Update features for Intel C++ 17.0.2 on UNIXBrad King2017-03-311-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Intel 17.0.2 on UNIX introduced a regression from 17.0.1 in its definition of `__cpp_constexpr` in `-std=c++14` mode. It incorrectly defines it as `200704` instead of the expected `201304`. Fix our feature detection table to account for this.
| * | | Merge branch 'FindBoost-1.64-deps' into releaseBrad King2017-03-301-0/+1
| |\ \ \
| * \ \ \ Merge branch 'sdcc-compiler-id' into releaseBrad King2017-03-291-2/+8
| |\ \ \ \
| * \ \ \ \ Merge branch '16742-swift-3.0' into releaseBrad King2017-03-291-1/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'vs-rc-defines' into releaseBrad King2017-03-292-1/+19
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'InstallRequiredSystemLibraries-vs2017' into releaseBrad King2017-03-271-7/+19
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'ipo-policy-CMP0069'Brad King2017-03-317-4/+78
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dfa8263f Implement interprocedural optimization for GNU compilers 1588a577 Add policy CMP0069 to enforce INTERPROCEDURAL_OPTIMIZATION a7575700 Refactoring: s,GetFeatureAsBool,IsIPOEnabled, e05835c3 CheckIPOSupported: Visual Studio and Xcode generators do not support IPO Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Nils Gladitz <nilsgladitz@gmail.com> Merge-request: !568
| * | | | | | | | Implement interprocedural optimization for GNU compilersRuslan Baratov2017-03-303-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Honor the `INTERPROCEDURAL_OPTIMIZATION` target property for GNU compilers by activating their link-time-optimization (LTO) flags.
| * | | | | | | | Add policy CMP0069 to enforce INTERPROCEDURAL_OPTIMIZATIONRuslan Baratov2017-03-304-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the `INTERPROCEDURAL_OPTIMIZATION` target property was honored only for the Intel compiler on Linux and otherwise ignored. In order to add support for more compilers incrementally without changing behavior in the future, add a new policy whose NEW behavior enforces the `INTERPROCEDURAL_OPTIMIZATION` property. Add flags for supported compilers and otherwise produce an error.
| * | | | | | | | CheckIPOSupported: Visual Studio and Xcode generators do not support IPORuslan Baratov2017-03-301-1/+6
| | | | | | | | |
* | | | | | | | | Merge topic '10749-aix-version'Brad King2017-03-301-1/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01a8a201 AIX: Properly detect host system version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !645
| * | | | | | | | | AIX: Properly detect host system versionGregor Jasny2017-03-291-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMakeDetermineSystem.cmake uses "uname -r" to get CMAKE_HOST_SYSTEM_VERSION on AIX. AIX uses "uname -v" for the major version and "uname -r" for the minor version. Thanks to Chris Taylor for the suggested patch. Closes #10749
* | | | | | | | | | Merge topic 'sdcc-compiler-id'Brad King2017-03-301-2/+8
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5695558f SDCC: Fix identification of current sdcc compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !644
| * | | | | | | | | SDCC: Fix identification of current sdcc compilerBrad King2017-03-291-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sdcc compiler no longer defines the `SDCC` preprocessor macro. Instead `__SDCC_VERSION_MAJOR` and similar component-wise macros are defined. Use them instead if defined. Issue: #16746
* | | | | | | | | | Merge topic 'FindBoost-1.64-deps'Brad King2017-03-301-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 556d98da FindBoost: Update 1.64 dependencies using 1.64 beta1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !629
| * | | | | | | | | FindBoost: Update 1.64 dependencies using 1.64 beta1Roger Leigh2017-03-301-0/+1
| |/ / / / / / / /
* | | | | | | | | Merge topic '16742-swift-3.0'Brad King2017-03-301-1/+7
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77139e32 Swift: Simplify mixed test case to make it version agnostic c03141c0 Swift: Default to Swift 3.0 with Xcode 8.3 and later Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !638