summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge topic 'doc-file_ARCHIVE_synopsis'Brad King2020-07-061-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f9766dad19 Help: Update file(ARCHIVE...) synopsis for renamed options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4977
| * | | | | | | | | Help: Update file(ARCHIVE...) synopsis for renamed optionsCraig Scott2020-07-061-2/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FILES and DIRECTORY options were renamed in bbcff21f71 (file(ARCHIVE*): Collapse FILES and DIRECTORY options, 2020-06-30), but the synopsis part of the file() documentation was missed. The synopsis also typically only shows the mandatory options. Update the synopsis to reflect the name changes and omit the DESTINATION option since it is not mandatory.
* | | | | | | | | Merge branch 'release-3.18'Craig Scott2020-07-060-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge topic 'doc-FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG' into release-3.18Craig Scott2020-07-061-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3bb287581c Help: FRAMEWORK_MULTI_CONFIG_POSTFIX example should use actual config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4973
* | \ \ \ \ \ \ \ \ Merge topic 'doc-FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG'Craig Scott2020-07-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 3bb287581c Help: FRAMEWORK_MULTI_CONFIG_POSTFIX example should use actual config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4973
| * | | | | | | | Help: FRAMEWORK_MULTI_CONFIG_POSTFIX example should use actual configCraig Scott2020-07-051-1/+1
| |/ / / / / / /
* | | | | | | | CMake Nightly Date StampKitware Robot2020-07-061-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-07-051-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-07-041-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge topic 'cpack-dmg-sla'Brad King2020-07-0312-0/+83
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b9737ead1f Tests: Add case for CPack DMG multi-language SLAs 925c026c31 Tests: Verify SLA in CPackComponentsForAll-DragNDrop-* DMG files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4969
| * | | | | | | Tests: Add case for CPack DMG multi-language SLAsBrad King2020-07-0211-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test for the feature added by commit f88533cc06 (CPackDMG: Add support for multilingual SLAs, 2015-10-19, v3.5.0-rc1~232^2). Issue: #20889
| * | | | | | | Tests: Verify SLA in CPackComponentsForAll-DragNDrop-* DMG filesBrad King2020-07-021-0/+16
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Issue: #20889
* | | | | | | Merge topic 'darwin-init-var-cleanup'Brad King2020-07-031-9/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2af6857562 Darwin: prefix internal osx variables with "_" to hide them from users Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4967
| * | | | | | | Darwin: prefix internal osx variables with "_" to hide them from usersChuck Cranor2020-07-031-9/+9
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A simple CMakeLists.txt on osx shows that variable "d" is set (but empty) by the system modules. this pollutes the user's variable namespace. I noticed this when I created a library target "d" and got unexpected policy CMP0054 warnings when trying to find_package(d CONFIG REQUIRED) (triggered from the generated "d-targets.cmake" ...). Note that non-"_" prefixed internal variables are ok within functions due to scoping rules. Fixes: #20898
* | | | | | | Merge topic 'xcode-lang-mm'Brad King2020-07-032-7/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 258c8734a9 Xcode: Fix LANGUAGE property on .m/.mm files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4965
| * | | | | | | Xcode: Fix LANGUAGE property on .m/.mm filesHarry Mallon2020-07-032-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When OBJC or OBJCXX is enabled as a language, prefer that for .m and .mm source file language selection. Fixes: #20257
* | | | | | | | Merge topic 'find-libraries-NAMES_PER_DIR'Brad King2020-07-0314-10/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d9d8dd054 FindPNG use NAMES_PER_DIR e6908b65b4 FindGIF use NAMES_PER_DIR 45ea7f9c80 FindGLEW use NAMES_PER_DIR 8e671f2564 FindLAPACK use NAMES_PER_DIR ec6bbfd58d FindIntl use NAMES_PER_DIR 667a229e8d FindProtobuf use NAMES_PER_DIR 64d37b4953 FindLibLZMA use NAMES_PER_DIR 9d2c119ff5 FindJPEG use NAMES_PER_DIR ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4961
| * | | | | | | | FindPNG use NAMES_PER_DIRSibi Siddharthan2020-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | | | FindGIF use NAMES_PER_DIRSibi Siddharthan2020-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | | | FindGLEW use NAMES_PER_DIRSibi Siddharthan2020-07-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | | | FindLAPACK use NAMES_PER_DIRSibi Siddharthan2020-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | | | FindIntl use NAMES_PER_DIRSibi Siddharthan2020-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | | | FindProtobuf use NAMES_PER_DIRSibi Siddharthan2020-07-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | | | FindLibLZMA use NAMES_PER_DIRSibi Siddharthan2020-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | | | FindJPEG use NAMES_PER_DIRSibi Siddharthan2020-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | | | FindIconv use NAMES_PER_DIRSibi Siddharthan2020-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | | | FindEXPAT use NAMES_PER_DIRSibi Siddharthan2020-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | | | FindCURL use NAMES_PER_DIRSibi Siddharthan2020-07-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | | | FindBZip2 use NAMES_PER_DIRSibi Siddharthan2020-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | | | FindBLAS use NAMES_PER_DIRSibi Siddharthan2020-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
| * | | | | | | | FindArmadillo use NAMES_PER_DIRSibi Siddharthan2020-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
* | | | | | | | | Merge branch 'release-3.18'Brad King2020-07-030-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'restore-cwd-translation-map' into release-3.18Brad King2020-07-039-1/+62
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85a945a607 Restore handling of build directory inside a symlinked path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4963
* | \ \ \ \ \ \ \ \ Merge topic 'restore-cwd-translation-map'Brad King2020-07-039-1/+62
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 85a945a607 Restore handling of build directory inside a symlinked path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4963
| * | | | | | | | Restore handling of build directory inside a symlinked pathBrad King2020-07-029-1/+62
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit dd8365b3f1 (Merge branch 'upstream-KWSys' into update-kwsys, 2020-04-06, v3.18.0-rc1~397^2) we imported KWSys commit `019afb6ea` (SystemTools: Drop GetCurrentWorkingDirectory 'collapse' argument, 2020-04-03). That caused `GetCurrentWorkingDirectory` to no longer send paths through the KWSys translation map and broke CMake's detection of the absolute path to a build directory containing a symbolic link. Add our own `cmSystemTools::GetCurrentWorkingDirectory` wrapper around the KWSys method in order to restore that mapping. Test-case-by: Ben Boeckel <ben.boeckel@kitware.com> Issue: #16228 Fixes: #20900
* | | | | | | | CMake Nightly Date StampKitware Robot2020-07-031-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge topic 'refactor_cmmakefile_language_standards_methods'Brad King2020-07-0210-877/+910
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc94b0249e cmStandardLevelResolver: Added to handle standard level queries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4932
| * | | | | | | cmStandardLevelResolver: Added to handle standard level queriesRobert Maynard2020-07-0110-877/+910
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored out of cmMakefile
* | | | | | | | Merge topic 'FindGTest-no_release_support'Brad King2020-07-021-12/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a064b18f85 FindGTest: Allow either "Debug" or "Release" configurations. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4950
| * | | | | | | | FindGTest: Allow either "Debug" or "Release" configurations.William Reid Paape2020-06-301-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call select_library_configurations on GTest library variable basenames "GTEST" and "GTEST_MAIN" before passing ${basename}_LIBRARY variables to find_package_handle_standard_args. This allows either _DEBUG or _RELEASE library variants to be found for find_package() to pass, whereas the original version would require the presence of _RELEASE variants. Fixes: #17799
* | | | | | | | | Merge topic 'gtest-xml-add-test'Brad King2020-07-024-0/+57
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b92e11683 Tests: Add test for GoogleTest XML_OUTPUT_DIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4954
| * | | | | | | | | Tests: Add test for GoogleTest XML_OUTPUT_DIRStefan Floeren2020-07-014-0/+57
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests to make sure the XML_OUTPUT_DIR is generated correctly and the correct files are getting created.
* | | | | | | | | Merge branch 'release-3.18'Brad King2020-07-020-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'FindLua-5.4' into release-3.18Brad King2020-07-021-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbb7f0e271 FindLua: Add support for Lua 5.4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4959
* | \ \ \ \ \ \ \ \ Merge topic 'FindLua-5.4'Brad King2020-07-021-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbb7f0e271 FindLua: Add support for Lua 5.4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4959
| * | | | | | | | | FindLua: Add support for Lua 5.4Felix Yan2020-07-011-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'release-3.18'Brad King2020-07-020-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'update-curl' into release-3.18Brad King2020-07-0240-219/+251
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d423195d5 Merge branch 'upstream-curl' into update-curl 4446fda8e0 curl 2020-06-30 (5a1fc8d3) 4e9685f657 curl: Update script to get curl 7.71.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4958
* | \ \ \ \ \ \ \ \ Merge topic 'update-curl'Brad King2020-07-0240-219/+251
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d423195d5 Merge branch 'upstream-curl' into update-curl 4446fda8e0 curl 2020-06-30 (5a1fc8d3) 4e9685f657 curl: Update script to get curl 7.71.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4958
| * | | | | | | | | Merge branch 'upstream-curl' into update-curlBrad King2020-07-0139-218/+250
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2020-06-30 (5a1fc8d3)