summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'include_external_msproject-map-config'Brad King2017-04-0615-25/+75
|\ | | | | | | | | | | | | | | 227de0b9 include_external_msproject: Honor MAP_IMPORTED_CONFIG_<CONFIG> 4cd815f0 VS: Pass whole target to WriteProjectConfigurations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !669
| * include_external_msproject: Honor MAP_IMPORTED_CONFIG_<CONFIG>Beeble2017-04-0511-11/+61
| | | | | | | | | | This allows projects added via `include_external_msproject` to compile the preferred configuration despite different naming conventions.
| * VS: Pass whole target to WriteProjectConfigurationsBeeble2017-04-056-14/+14
| |
* | Merge topic 'codelite-virtual-dirs'Brad King2017-04-062-17/+88
|\ \ | | | | | | | | | | | | | | | | | | 8243fe7c CodeLite: Distribute source files into folders (virtual directories) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !653
| * | CodeLite: Distribute source files into folders (virtual directories)rahmjan2017-03-312-17/+88
| | |
* | | Merge topic 'bindexplib-format'Brad King2017-04-061-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c216e803 bindexplib: Run clang-format on header file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !670
| * | | bindexplib: Run clang-format on header fileBrad King2017-04-051-0/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-04-061-1/+1
| | | |
* | | | Merge topic 'fix-genex-example'Brad King2017-04-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ecbe76e Help: Fix error in $<COMPILE_LANGUAGE:lang> example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !667
| * | | | Help: Fix error in $<COMPILE_LANGUAGE:lang> exampleNils Gladitz2017-04-041-1/+1
| | | | |
* | | | | Merge topic 'prop-is-multi-config'Brad King2017-04-0513-0/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01826231 Tests: Add case for GENERATOR_IS_MULTI_CONFIG 38fd5866 Add GENERATOR_IS_MULTI_CONFIG global property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !657
| * | | | | Tests: Add case for GENERATOR_IS_MULTI_CONFIGBrad King2017-04-045-0/+11
| | | | | |
| * | | | | Add GENERATOR_IS_MULTI_CONFIG global propertyBastien Schatt2017-04-048-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16768
* | | | | | 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-053-54/+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-043-54/+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-058-16/+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-048-15/+16
| | | | | | |
| * | | | | | CheckIPOSupported: Move '_CMakeLTOTest-*' under 'CMakeFiles'Ruslan Baratov2017-04-041-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge topic 'lang-specific-binutils'Brad King2017-04-0512-29/+33
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0312-29/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'bindexplib-arm'Brad King2017-04-052-289/+223
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48fa2914 bindexplib: add ARM support 97c605fd bindexplib: remove unused code 7a8860af bindexplib: clang-format Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !604
| * | | | | | bindexplib: add ARM supportMikhail Paulyshka2017-04-041-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16728
| * | | | | | bindexplib: remove unused codeMikhail Paulyshka2017-03-221-67/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove code not used since commit v3.7.0-rc1~395^2 (bindexplib: Export symbols from objects even with explicit markup, 2016-06-30).
| * | | | | | bindexplib: clang-formatMikhail Paulyshka2017-03-222-281/+278
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-04-051-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | 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 branch 'release'Brad King2017-04-040-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'server-mode-test-no-pyc' into releaseBrad King2017-04-031-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mac-implicit-link-no-lto-flag' into releaseBrad King2017-04-032-1/+15
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ 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-042-1/+15
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-032-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'server-mode-test-no-pyc'Brad King2017-04-041-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e51d9395 Tests: Avoid generating .pyc files during Server test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !659
| * | | | | | | | | Tests: Avoid generating .pyc files during Server testBrad King2017-04-031-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid writing any files to the source tree during testing. Fixes: #16770
* | | | | | | | | Merge topic 'test-CMakeOnly.AllFindModules-local-exclude'Brad King2017-04-042-2/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe21ccc4 Tests: Optionally skip local packages versions in CMakeOnly.AllFindModules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !661
| * | | | | | | | | Tests: Optionally skip local packages versions in CMakeOnly.AllFindModulesBrad King2017-04-032-2/+9
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some machines have incomplete or otherwise broken installations of specific packages. Allow local configuration to prevent the test from failing on such packages if the version number cannot be extracted.
* | | | | | | | | Merge topic 'test-CMake.GetPrerequisites-config-message'Brad King2017-04-042-9/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2c22862 Tests: Fix CMake.GetPrerequisites test config message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !654
| * | | | | | | | | Tests: Fix CMake.GetPrerequisites test config messageBrad King2017-04-032-9/+3
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.11~239^2~1 (ProcessorCount test: fix path to cmsysTestsCxx executable, 2013-01-24) we accidentally printed a literal `${CTEST_CONFIGURATION_TYPE}` instead of the actual build configuration. Update the message to use a generator expression to get the real build configuration used.
* | | | | | | | | 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.
* | | | | | | | CMake Nightly Date StampKitware Robot2017-04-041-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'release'Brad King2017-04-030-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |