summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmCacheManager::GetProperty: return cmPropVitaly Stakhovsky2020-03-193-32/+28
|
* Merge topic 'cmprop-state'Brad King2020-03-1915-76/+74
|\ | | | | | | | | | | | | bd89133543 cmState::GetCacheEntryValue: return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4493
| * cmState::GetCacheEntryValue: return cmPropVitaly Stakhovsky2020-03-1715-76/+74
| |
* | Merge topic 'target-improve'Brad King2020-03-195-30/+30
|\ \ | | | | | | | | | | | | | | | | | | b915fec56e cmTarget: minor code improvements Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4483
| * | cmTarget: minor code improvementsVitaly Stakhovsky2020-03-175-30/+30
| |/
* | Merge topic 'CheckLanguage-private-vars'Brad King2020-03-191-8/+8
|\ \ | | | | | | | | | | | | | | | | | | 36baf1f13c CheckLanguage: hide commonly used variable names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4497
| * | CheckLanguage: hide commonly used variable namesHannes Vogt2020-03-181-8/+8
| | | | | | | | | | | | | | | | | | | | | The check_language sets internal variables with a common name in the caller's scope: `result`, `output` and `content`. They are now prefixed with `_cl_`, inspired by the CheckLibraryExists module.
* | | Merge branch 'release-3.17'Brad King2020-03-190-0/+0
|\ \ \
| * \ \ Merge topic 'trace-format-json-doc' into release-3.17Brad King2020-03-192-2/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1994f950ff cmake: List valid values for --trace-format on the command line e39766d84a Help: Fix documentation of --trace-format parameter Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4500
* | \ \ \ Merge topic 'trace-format-json-doc'Brad King2020-03-192-2/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1994f950ff cmake: List valid values for --trace-format on the command line e39766d84a Help: Fix documentation of --trace-format parameter Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4500
| * | | | cmake: List valid values for --trace-format on the command lineKyle Edwards2020-03-181-1/+2
| | | | |
| * | | | Help: Fix documentation of --trace-format parameterKyle Edwards2020-03-181-1/+1
| |/ / /
* | | | CMake Nightly Date StampKitware Robot2020-03-191-1/+1
| |/ / |/| |
* | | Merge topic 'FindRuby-updates'Brad King2020-03-187-49/+176
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46064c8193 FindRuby: Add support for versions up to 2.7 675eaf3bd0 FindRuby: Update MSVC runtime library selection b970e25d98 FindRuby: Remove extra whitespace ecdace4d61 FindRuby: Include FPHSA closer to where it is used f52f496138 FindRuby: Provide Ruby_LIBRARIES result variable b00d736a0b FindRuby: Add dedicated tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4481
| * | | FindRuby: Add support for versions up to 2.7Julien Marrec2020-03-171-30/+82
| | | | | | | | | | | | | | | | Fixes: #20370
| * | | FindRuby: Update MSVC runtime library selectionBrad King2020-03-171-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the `MSVC_TOOLSET_VERSION` variable computed by CMake to get the matching Ruby library name component. Inspired-by: Julien Marrec <julien.marrec@gmail.com>
| * | | FindRuby: Remove extra whitespaceJulien Marrec2020-03-161-1/+1
| | | |
| * | | FindRuby: Include FPHSA closer to where it is usedBrad King2020-03-161-1/+1
| | | |
| * | | FindRuby: Provide Ruby_LIBRARIES result variableBrad King2020-03-162-3/+7
| | | | | | | | | | | | | | | | | | | | The `cmake-developer(7)` manual documents that a plural non-cached name should be used for results.
| * | | FindRuby: Add dedicated testsJulien Marrec2020-03-166-0/+82
| | | | | | | | | | | | | | | | Issue: #20370
* | | | Merge topic 'FindPkgConfig-broken-pkg-config'Brad King2020-03-184-3/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c99f5df28 FindPkgConfig: Add test for specified pkg-config tool missing b59f36aad8 FindPkgConfig: Unset results when pkg-config is broken Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4451
| * | | | FindPkgConfig: Add test for specified pkg-config tool missingBrad King2020-03-173-0/+12
| | | | |
| * | | | FindPkgConfig: Unset results when pkg-config is brokenBrad King2020-03-161-3/+18
| | | | | | | | | | | | | | | | | | | | Inspired-by: FUJI Goro <goro@fastly.com>
* | | | | Merge topic 'bootstrap-version-crlf'Brad King2020-03-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ec6fbcb9b bootstrap: Tolerate trailing content in CMakeVersion.cmake components Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4491
| * | | | | bootstrap: Tolerate trailing content in CMakeVersion.cmake componentsjjYBdx4IL2020-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | On CYGWIN, tolerate DOS linefeeds in `Source/CMakeVersion.cmake`.
* | | | | | Merge branch 'release-3.17'Brad King2020-03-180-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'FindPython-version-validation-fix' into release-3.17Brad King2020-03-183-19/+71
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc7f116cb4 FindPython: fix regression on version validation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4492
* | \ \ \ \ \ Merge topic 'FindPython-version-validation-fix'Brad King2020-03-183-19/+71
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc7f116cb4 FindPython: fix regression on version validation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4492
| * | | | | | FindPython: fix regression on version validationMarc Chevrier2020-03-173-19/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 3dab4682f6 (FindPython: reduces consumption of resources, 2020-02-10, v3.17.0-rc1~11^2) we accidentally broke the python executable version validation when the "LOCATION" strategy is used with the plain `FindPython` module. Fix the logic and add test cases covering those combinations. Fixes: #20465
* | | | | | | CMake Nightly Date StampKitware Robot2020-03-181-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'file-archive'Brad King2020-03-1723-0/+507
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c7e1198a23 file: Add ARCHIVE_{CREATE|EXTRACT} subcommands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4475
| * | | | | | file: Add ARCHIVE_{CREATE|EXTRACT} subcommandsCristian Adam2020-03-1623-0/+507
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20443
* | | | | | | Merge topic 'property-computer'Brad King2020-03-173-19/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fad0ee5404 cmTargetPropertyComputer::GetProperty: return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4482
| * | | | | | | cmTargetPropertyComputer::GetProperty: return cmPropVitaly Stakhovsky2020-03-163-19/+23
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'prop_t'Brad King2020-03-1712-28/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60f57d0dcc cmPropertyMap: Introduce cmProp as return type for GetProperty() functions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4471
| * | | | | | | cmPropertyMap: Introduce cmProp as return type for GetProperty() functionsVitaly Stakhovsky2020-03-1312-28/+35
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently properties are usually stored internally as `std::string`. However, family of GetProperty() functions return them as `const char *` using `c_str()`. The proposed `cmProp`, typedef'ed as `const std::string *` will expose properties more naturally.
* | | | | | | Merge topic 'mf_profiling_json'Brad King2020-03-171-7/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 897af4c266 cmMakefileProfilingData: Fix ambiguous conversion to Json::Value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4479
| * | | | | | | cmMakefileProfilingData: Fix ambiguous conversion to Json::ValueRaul Tambre2020-03-161-7/+8
| | | | | | | |
* | | | | | | | Merge branch 'release-3.17'Brad King2020-03-170-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge topic 'FindThreads-doc' into release-3.17Brad King2020-03-171-16/+29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1502f281dd FindThreads: Improve documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4480
* | \ \ \ \ \ \ \ Merge topic 'FindThreads-doc'Brad King2020-03-171-16/+29
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1502f281dd FindThreads: Improve documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4480
| * | | | | | | | FindThreads: Improve documentationRolf Eike Beer2020-03-161-16/+29
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Issue: #19823
* | | | | | | | CMake Nightly Date StampKitware Robot2020-03-171-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge topic 'define-property'Brad King2020-03-168-39/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73d52a862b cmPropertyDefinition: Construct directly in defined state Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4470
| * | | | | | | cmPropertyDefinition: Construct directly in defined stateVitaly Stakhovsky2020-03-138-39/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move `cmPropertyDefinitionMap::DefineProperty` functionality directly into the constructor to avoid an intermediate state.
* | | | | | | | Merge topic 'gtest-parallel-xml'Brad King2020-03-167-1/+91
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32bc6aa9b6 GoogleTest: Add release note for XML_OUTPUT_DIR 0001339a6f GoogleTest: Add test case for XML_OUTPUT_DIR e9ab39eb1d GoogleTest: Add XML_OUTPUT_DIR parameter Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4433
| * | | | | | | | GoogleTest: Add release note for XML_OUTPUT_DIRAlexander Stein2020-03-131-0/+6
| | | | | | | | |
| * | | | | | | | GoogleTest: Add test case for XML_OUTPUT_DIRAlexander Stein2020-03-134-0/+69
| | | | | | | | |
| * | | | | | | | GoogleTest: Add XML_OUTPUT_DIR parameterAlexander Stein2020-03-132-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When executing googltests in parallel using 'ctest -j n' and using '--gtest_output=xml' there is a race condition upon file creation. See googletest issue https://github.com/google/googletest/issues/2506. As all testcases (potentially) can be run in parallel each testcase has to create it's own XML JUnit file. EXTRA_ARGS is not suitable because it is identical per testsuite. So instead a new (opitional) parameter has been introduced to specify the storage location for each test of the testsuite.
* | | | | | | | | Merge topic 'remove_trailing_whitespace'Brad King2020-03-161-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67a592583d Source: Remove trailing whitespace from export generation code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4474