summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmPolicies: Drop unnecessary check from ApplyPolicyVersionBrad King2018-03-161-9/+3
| | | | This internal API is never called with `version_min` empty.
* cmPolicies: Pass policy version as std::stringBrad King2018-03-164-8/+10
|
* Merge branch 'release-3.10'Brad King2018-03-160-0/+0
|\
| * CMake 3.10.3v3.10.3Brad King2018-03-161-1/+1
| |
* | Merge branch 'release-3.11'Brad King2018-03-160-0/+0
|\ \
| * \ Merge branch 'gtest_discover_tests_timeout' into release-3.11Brad King2018-03-1615-16/+145
| |\ \ | | | | | | | | | | | | Merge-request: !1851
* | \ \ Merge branch 'release-3.10'Brad King2018-03-160-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'gtest_discover_tests_timeout' into release-3.10Brad King2018-03-1515-16/+145
| |\ \ \ | | | |/ | | |/| | | | | Merge-request: !1851
* | | | Merge topic 'gtest_discover_tests_timeout'Brad King2018-03-1615-16/+145
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 96fdde26bb GoogleTest: Rename TIMEOUT parameter to avoid clash Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1851
| * | | GoogleTest: Rename TIMEOUT parameter to avoid clashCraig Scott2018-03-1515-16/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In gtest_discover_tests(), the TIMEOUT keyword was making it impossible to set the TIMEOUT test property via the PROPERTIES keyword. This would be a frequent case, but it doesn't complain and instead silently does something different to what would normally be expected. The TIMEOUT keyword has been renamed to DISCOVERY_TIMEOUT, thereby removing the clash. This is a breaking change. 3.10.1 and 3.10.2 were the only versions that supported the TIMEOUT keyword and uses of it were likely not working as intended. Fixes: #17801
* | | | CMake Nightly Date StampKitware Robot2018-03-161-1/+1
| | | |
* | | | Merge topic 'clarify-contributing-doc'Brad King2018-03-151-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27502491dd CONTRIBUTING: Clarify choice of master or release branch as a base Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> Merge-request: !1845
| * | | | CONTRIBUTING: Clarify choice of master or release branch as a baseJean-Christophe Fillion-Robin2018-03-151-0/+2
| | | | |
* | | | | Merge topic 'compile-options-shell'Brad King2018-03-157-5/+73
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce0b983216 target_compile_options: Add syntax to specify shell strings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1841
| * | | | | target_compile_options: Add syntax to specify shell stringsBrad King2018-03-147-5/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Options specified via `COMPILE_OPTIONS` and `INTERFACE_COMPILE_OPTIONS` are deduplicated, but individual options can legitimately be duplicated when grouped with other options, e.g. -D A -D B After deduplication that becomes `-D A B`. Therefore we need a way to treat groups of options as units during deduplication. A simple approach is to specify each group as one option, e.g. "-D A" "-D B" However, that conflicts with options that legitimately have spaces. To break this ambiguity, add a `SHELL:` prefix syntax to specify that an option should be parsed like shell command line arguments after deduplication, e.g. "SHELL:-D A" "SHELL:-D B" These will survive deduplication intact, and then be parsed to produce `-D A -D B` on the final command line. Fixes: #15826
* | | | | | Merge branch 'release-3.11'Brad King2018-03-150-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'xl-cc-default-std' into release-3.11Brad King2018-03-141-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1854
| * \ \ \ \ \ Merge branch 'findjni-mips-r6-new-arch' into release-3.11Brad King2018-03-141-1/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1853
* | \ \ \ \ \ \ Merge topic 'xl-cc-default-std'Brad King2018-03-151-1/+2
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 194b74daec XL: Fix C default level detection when invoked as 'cc' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1854
| * | | | | | | XL: Fix C default level detection when invoked as 'cc'Brad King2018-03-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The IBM XL C compiler does not define `__STDC__` when invoked as plain `cc` instead of `xlc`, so `CMAKE_C_STANDARD_COMPUTED_DEFAULT` does not get set and CMake fails. Teach CMake about the XL compiler's default C standard in this case. Fixes: #17649
* | | | | | | | Merge topic 'bootstrap-clarify-error'Brad King2018-03-151-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25eb6e60d7 bootstrap: Clarify error when building with invalid CXXFLAGS Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !1850
| * | | | | | | | bootstrap: Clarify error when building with invalid CXXFLAGSBen Chaney2018-03-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention the flags used when complaining that the compiler does not work.
* | | | | | | | | Merge topic 'findjni-mips-r6-new-arch'Brad King2018-03-151-1/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c92596e96 FindJNI: add some new architecture names for mips release 6 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1853
| * | | | | | | | FindJNI: add some new architecture names for mips release 6YunQiang Su2018-03-141-1/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-03-151-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'cmake_project_xxx_docs'Brad King2018-03-145-10/+74
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a2a9d107d Help: Fix incorrect CMAKE_PROJECT_xxx docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1847
| * | | | | | | | Help: Fix incorrect CMAKE_PROJECT_xxx docsCraig Scott2018-03-135-10/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs for CMAKE_PROJECT_NAME and CMAKE_PROJECT_DESCRIPTION were erroneously documenting the behavior of PROJECT_NAME and PROJECT_DESCRIPTION respectively. Fix these and update the project() docs to also mention CMAKE_PROJECT_NAME and CMAKE_PROJECT_DESCRIPTION. Fixes: #17815
* | | | | | | | | Merge topic 'build_and_test_mode_docs'Brad King2018-03-141-10/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b43adc45c Help: Clarify ctest build-and-test mode options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1848
| * | | | | | | | | Help: Clarify ctest build-and-test mode optionsCraig Scott2018-03-131-10/+14
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | Fixes: #17807
* | | | | | | | | Merge topic 'doc-vs-workdir-versions'Brad King2018-03-141-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b25cc452a Help: Document VS_DEBUGGER_WORKING_DIRECTORY supported VS versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1843
| * | | | | | | | | Help: Document VS_DEBUGGER_WORKING_DIRECTORY supported VS versionsHannes Mezger2018-03-131-0/+3
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-141-1/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge branch 'release-3.11'Brad King2018-03-130-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'genex-COMPILE_LANGUAGE-system-include' into release-3.11Brad King2018-03-139-25/+43
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1844
| * \ \ \ \ \ \ \ Merge branch 'ccmake-stack-smashing' into release-3.11Brad King2018-03-131-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1836
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.10'Brad King2018-03-130-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'ccmake-stack-smashing' into release-3.10Brad King2018-03-131-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | Merge-request: !1836
* | | | | | | | | | Merge topic 'genex-COMPILE_LANGUAGE-system-include'Brad King2018-03-139-25/+43
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b5e52fd65 Genex: Fix COMPILE_LANGUAGE propagation through try_compile 2deb9b7f34 Genex: Fix COMPILE_LANGUAGE in SYSTEM include directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1844
| * | | | | | | | | Genex: Fix COMPILE_LANGUAGE propagation through try_compileBrad King2018-03-124-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When evaluating include directories during export to a `try_compile` test project, thread the compile language through to the generator expression evaluator so it can support `$<COMPILE_LANGUAGE:...>`. Issue: #17811
| * | | | | | | | | Genex: Fix COMPILE_LANGUAGE in SYSTEM include directoriesBrad King2018-03-126-15/+29
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When evaluating `INTERFACE_SYSTEM_INCLUDE_DIRECTORIES`, or evaluating `INTERFACE_INCLUDE_DIRECTORIES` on an imported target, thread the compile language through to the generator expression evaluator so that it can support `$<COMPILE_LANGUAGE:...>`. Fixes: #17811
* | | | | | | | | Merge topic 'ccmake-stack-smashing'Brad King2018-03-131-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 7899e53691 ccmake: fix status line buffer overflow on very wide terminals Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1836
| * | | | | | | ccmake: fix status line buffer overflow on very wide terminalsTianhao Chai2018-03-131-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | A mistyped length calculation will memset across stack frame when the user's terminal width is larger than 270.
* | | | | | | CMake Nightly Date StampKitware Robot2018-03-131-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'release-3.11'Brad King2018-03-120-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'ep-support-passing-var-ending-with-notfound' into release-3.11Brad King2018-03-125-6/+36
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1838
| * \ \ \ \ \ Merge branch 'update-buildsystem-docs' into release-3.11Brad King2018-03-121-6/+5
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | Merge-request: !1839
* | | | | | | Merge topic 'update-buildsystem-docs'Brad King2018-03-121-6/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 78756429ab Help: Adapt cmake-buildsystem(7) to new IMPORTED targets features Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1839
| * | | | | | Help: Adapt cmake-buildsystem(7) to new IMPORTED targets featuresKai Wolf2018-03-121-6/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.11.0-rc1~433^2~2 (Teach target_* commands to set INTERFACE properties of IMPORTED targets, 2017-09-18) it is now possible to use the customary `target_*` commands for adjusting the settings of an IMPORTED target. Update documentation accordingly.
* | | | | | Merge topic 'ep-support-passing-var-ending-with-notfound'Brad King2018-03-125-6/+36
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ad981c8f7 ExternalProject: Fix cache generation when last args ends with "-NOTFOUND" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1838
| * | | | | ExternalProject: Fix cache generation when last args ends with "-NOTFOUND"Jean-Christophe Fillion-Robin2018-03-125-6/+36
| |/ / / /