summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.19'Brad King2020-10-260-0/+0
|\
| * Merge topic 'FindBoost-config-mode' into release-3.19Brad King2020-10-261-1/+12
| |\ | | | | | | | | | | | | | | | | | | | | | 4b2a61946f FindBoost: Honor BOOST_ROOT when finding upstream BoostConfig b32cb33275 FindBoost: Honor Boost_NO_SYSTEM_PATHS when finding upstream BoostConfig Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5408
* | \ Merge topic 'FindBoost-config-mode'Brad King2020-10-261-1/+12
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 4b2a61946f FindBoost: Honor BOOST_ROOT when finding upstream BoostConfig b32cb33275 FindBoost: Honor Boost_NO_SYSTEM_PATHS when finding upstream BoostConfig Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5408
| * | FindBoost: Honor BOOST_ROOT when finding upstream BoostConfigBrad King2020-10-221-0/+6
| | | | | | | | | | | | Fixes: #21200
| * | FindBoost: Honor Boost_NO_SYSTEM_PATHS when finding upstream BoostConfigBrad King2020-10-221-1/+6
| | | | | | | | | | | | Issue: #21200
* | | Merge branch 'release-3.19'Craig Scott2020-10-260-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'docs-cleanup-3.19' into release-3.19Craig Scott2020-10-2614-90/+107
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 95c14579f2 Help: Cleanup typos and grammar for the 3.19 release Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5419
* | \ \ Merge topic 'docs-cleanup-3.19'Craig Scott2020-10-2614-90/+107
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 95c14579f2 Help: Cleanup typos and grammar for the 3.19 release Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5419
| * | | Help: Cleanup typos and grammar for the 3.19 releaseCraig Scott2020-10-2414-90/+107
| |/ /
* | | CMake Nightly Date StampKitware Robot2020-10-261-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2020-10-251-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2020-10-241-1/+1
| | |
* | | Merge topic 'no-override-flow-control'Brad King2020-10-2323-21/+108
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8aee7fdb32 cmState: Prohibit override of flow control commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5409
| * | | cmState: Prohibit override of flow control commandsKyle Edwards2020-10-2223-21/+108
| | | |
* | | | Merge topic 'proper-command-nesting'Brad King2020-10-2322-114/+261
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12f6e37eb7 cmListFileCache: Enforce proper nesting of flow control statements 67383725bd cm::optional: Add constructor delegation to nullopt_t constructor 0668120398 cm::optional: Fix move assignment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5401
| * | | | cmListFileCache: Enforce proper nesting of flow control statementsKyle Edwards2020-10-2220-101/+198
| | | | | | | | | | | | | | | | | | | | Fixes: #19153
| * | | | cm::optional: Add constructor delegation to nullopt_t constructorKyle Edwards2020-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some static analysis tools incorrectly identify this constructor as leaving _has_value in an undefined state. Explicitly call the default constructor to force _has_value to false.
| * | | | cm::optional: Fix move assignmentKyle Edwards2020-10-212-13/+62
| | | | |
* | | | | Merge topic 'ctest-hostname-cleanup'Brad King2020-10-234-1/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11d21c1c4e CTest: Avoid invoking external tool to get the host name 3f3762856f Tests: Add case verifying CTest module SITE variable 94c6295db1 Help: Document site_name command use of HOSTNAME variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5407
| * | | | | CTest: Avoid invoking external tool to get the host nameBrad King2020-10-221-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Populate the SITE cache entry using an internal query instead.
| * | | | | Tests: Add case verifying CTest module SITE variableBrad King2020-10-222-0/+6
| | | | | |
| * | | | | Help: Document site_name command use of HOSTNAME variableBrad King2020-10-221-0/+4
| | | | | |
* | | | | | Merge topic 'FindGTest-config-mode'Brad King2020-10-233-33/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2327b4330c FindGTest: Added support for CONFIG mode 6d45f951ed FindGTest: Minor whitespace change, moved an include upwards 98d5f033ed FindGTest: Ensure target names follow upstream GTest 585cc7c930 ci: install gmock in the Fedora 31 image Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5404
| * | | | | | FindGTest: Added support for CONFIG modeMario Emmenlauer2020-10-221-15/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream GTest provides its own CMake package files. Use them if available. Fixes: #18801
| * | | | | | FindGTest: Minor whitespace change, moved an include upwardsMario Emmenlauer2020-10-221-1/+2
| | | | | | |
| * | | | | | FindGTest: Ensure target names follow upstream GTestMario Emmenlauer2020-10-221-23/+32
| | | | | | |
| * | | | | | ci: install gmock in the Fedora 31 imageBrad King2020-10-222-1/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gmock libraries are referenced by GTest's CMake package files. While at it, also explicitly install gettext. It is installed already, but make it explicit for future testing of the FindGettext module.
* | | | | | Merge branch 'release-3.19'Brad King2020-10-230-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'vs-fortran-debugging-flags' into release-3.19Brad King2020-10-231-3/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ad6fabfc5 VS: Remove flag table entries for Fortran /Z* flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5406
* | \ \ \ \ \ Merge topic 'vs-fortran-debugging-flags'Brad King2020-10-231-3/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ad6fabfc5 VS: Remove flag table entries for Fortran /Z* flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5406
| * | | | | | VS: Remove flag table entries for Fortran /Z* flagsVolker Jacht2020-10-221-3/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were included when the Fortran flag table was first created by commit 10c91ded4f (ENH: add support for Intel Fortran Visual studio IDE, 2008-04-30, v2.8.0~2227), but they map to fields not actually supported by the IDE. Remove their table entries. Instead use just `/debug:minimal` and `/debug:full` to control debug information level in VS Intel Fortran. Let flags like `/Z7` pass through as raw additional options because they have no corresponding IDE property and can be used to complement the supported options. Fixes: #21340
* | | | | | Merge branch 'release-3.19'Craig Scott2020-10-230-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'cmake-presets-toolset-arch-config' into release-3.19Craig Scott2020-10-2333-95/+241
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5387
* | \ \ \ \ \ Merge topic 'cmake-presets-toolset-arch-config'Craig Scott2020-10-2333-95/+241
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5387
| * | | | | | CMakePresets.json: Split cmakeGeneratorConfig fieldKyle Edwards2020-10-2233-95/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make this field separate for both architecture and toolset. Allow architecture and toolset to be either strings or objects with value and strategy fields. Fixes: #21317
* | | | | | | Merge branch 'release-3.19'Craig Scott2020-10-230-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'cmake-presets-source-dir-name' into release-3.19Craig Scott2020-10-235-0/+12
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25742c589c CMakePresets.json: Add ${sourceDirName} macro Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: Craig Scott <craig.scott@crascit.com> Merge-request: !5386
* | | | | | | Merge topic 'cmake-presets-source-dir-name'Craig Scott2020-10-235-0/+12
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25742c589c CMakePresets.json: Add ${sourceDirName} macro Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: Craig Scott <craig.scott@crascit.com> Merge-request: !5386
| * | | | | | CMakePresets.json: Add ${sourceDirName} macroKyle Edwards2020-10-225-0/+12
| |/ / / / / | | | | | | | | | | | | | | | | | | Fixes: #21312
* | | | | | CMake Nightly Date StampKitware Robot2020-10-231-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'cmake-16773'Kyle Edwards2020-10-2212-8/+56
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c324689a7 include: refactor call sites of cmMakefile::ReadDependentFile Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !5405
| * | | | | include: refactor call sites of cmMakefile::ReadDependentFileAsit Dhal2020-10-2112-8/+56
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16773
* | | | | | Merge branch 'release-3.19'Kyle Edwards2020-10-220-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'cmake-presets-invalid-macro' into release-3.19Kyle Edwards2020-10-2217-183/+268
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 638557cbfe CMakePresets.json: Properly report macro expansion errors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5397
* | \ \ \ \ \ Merge topic 'cmake-presets-invalid-macro'Kyle Edwards2020-10-2217-183/+268
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 638557cbfe CMakePresets.json: Properly report macro expansion errors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5397
| * | | | | | CMakePresets.json: Properly report macro expansion errorsKyle Edwards2020-10-2117-183/+268
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make a distinction between strings which simply use the $vendor{<...>} macro, which is valid but makes it unusable by CMake, and strings which actually contain invalid macro expansions. Fixes: #21308
* | | | | | Merge branch 'release-3.19'Kyle Edwards2020-10-220-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'cmake-presets-boolean-cache' into release-3.19Kyle Edwards2020-10-226-7/+71
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 920d180047 CMakePresets.json: Allow boolean for cache variable value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5398
* | | | | | Merge topic 'cmake-presets-boolean-cache'Kyle Edwards2020-10-226-7/+71
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | | | | | | | | | | | | 920d180047 CMakePresets.json: Allow boolean for cache variable value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5398
| * | | | CMakePresets.json: Allow boolean for cache variable valueKyle Edwards2020-10-216-7/+71
| |/ / / | | | | | | | | | | | | Fixes: #21327