summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Add test for early source lookup of file(GENERATE)Josef Angstenberger2020-09-212-0/+11
| | | | | | | | | | | The output file structures of file(GENERATE) have to be created early to be able to use the generated files in source lists. This was not done correctly for subdirectories which has been fixed in commit aee2c51224 (file(GENERATE): Create output file structures for all directories first, 2020-09-10). Add a test case to address issue #21144.
* Merge topic 'xcode-12-new-build-system'Brad King2020-09-2159-91/+748
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8ecd4df5f ExternalProject: Use CMP0114 NEW behavior with Xcode "new build system" fe258f6382 Tests: Skip RunCMake.XcodeProject device cases for Xcode "new build system" 1c3d2d0951 Tests: Skip Qt*Autogen.MocSkipSource case for Xcode "new build system" 542884e527 Tests: Update RunCMake.XcodeProject cases for Xcode "new build system" 832a78be2d Tests: Update BuildDepends test for Xcode "new build system" ff76c51ec3 Tests: Update RunCMake.file case with workaround for Xcode "new build system" 1806cdd17c Tests: Avoid duplicate custom commands for Xcode "new build system" 8d5f4c4db9 Xcode: Switch to the "new build system" for Xcode 12 and above ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5229
| * ExternalProject: Use CMP0114 NEW behavior with Xcode "new build system"Brad King2020-09-1812-8/+74
| | | | | | | | | | | | | | The ExternalProject module cannot be implemented in the Xcode "new build system" without using CMP0114's NEW behavior. When configuring for that build system, warn if the policy is not set to NEW and use NEW behavior anyway.
| * Tests: Skip RunCMake.XcodeProject device cases for Xcode "new build system"Brad King2020-09-181-0/+5
| | | | | | | | | | | | | | | | The Xcode "new build system" selects different architectures for device builds than the old build system does. Skip those tests on Xcode 12+ pending further investigation. Issue: #21206
| * Tests: Skip Qt*Autogen.MocSkipSource case for Xcode "new build system"Brad King2020-09-181-0/+7
| | | | | | | | | | | | | | | | | | This test case enables AUTOMOC on the same sources in two separate targets. This causes the `moc_*.cpp` generation custom commands to be added to multiple `_autogen` targets, which is not allowed by the Xcode "new build system". Skip the part of the test that triggers this problem for now. Issue: #21205
| * Tests: Update RunCMake.XcodeProject cases for Xcode "new build system"Brad King2020-09-181-1/+3
| |
| * Tests: Update BuildDepends test for Xcode "new build system"Brad King2020-09-182-0/+10
| | | | | | | | | | | | Xcode somehow tracks what we're running inside a custom command, so we cannot prevent it from regenerating the `noregen.h` header even though we do not declare any dependencies of it.
| * Tests: Update RunCMake.file case with workaround for Xcode "new build system"Brad King2020-09-181-0/+6
| |
| * Tests: Avoid duplicate custom commands for Xcode "new build system"Brad King2020-09-182-0/+15
| |
| * Xcode: Switch to the "new build system" for Xcode 12 and aboveBrad King2020-09-1826-31/+423
| | | | | | | | | | | | | | Provide an option to switch back to the original build system via `-T buildsystem=1`. Fixes: #18088
| * Xcode: Add option to specify build system variantBrad King2020-09-1815-19/+187
| | | | | | | | | | | | Extend the `-T <toolset>` option to support a `buildsystem=` field with the Xcode generator. Add a `CMAKE_XCODE_BUILD_SYSTEM` variable to inform project code about the selected build system variant.
| * Xcode: Factor out build phase variable declarationsBrad King2020-09-181-7/+12
| |
| * Xcode: Clarify name of legacy run script build phase helperBrad King2020-09-182-8/+8
| |
| * Tests: Avoid duplicate custom commands in QtAutogen.AutogenOriginDependsOffBrad King2020-09-183-6/+11
| |
| * Tests: Remove RunCMake.ExternalProject unnecessary CMake version checkBrad King2020-09-151-2/+0
| |
| * Tests: Simplify RunCMake.ExternalProject Add_StepDependencies stderrBrad King2020-09-154-24/+2
| | | | | | | | | | Set CMP0114 to OLD for this case to suppress the policy warning. The warning is covered by the `NO_DEPENDS-CMP0114-WARN` case.
| * Help: Move CMAKE_XCODE_GENERATE_SCHEME to proper manual sectionBrad King2020-09-141-1/+1
| |
* | Merge branch 'release-3.18'Brad King2020-09-210-0/+0
|\ \
| * \ Merge topic 'foreach-int-parse-range-check' into release-3.18Brad King2020-09-215-0/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 0412b55b83 foreach: Fix crash parsing integer out of range Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5239
* | \ \ Merge topic 'foreach-int-parse-range-check'Brad King2020-09-215-0/+15
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 0412b55b83 foreach: Fix crash parsing integer out of range Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5239
| * | | foreach: Fix crash parsing integer out of rangeBen McMorran2020-09-185-0/+15
| | | |
* | | | CMake Nightly Date StampKitware Robot2020-09-211-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2020-09-201-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2020-09-191-1/+1
| | | |
* | | | Merge topic 'rel-drop-old'Brad King2020-09-186-431/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a88e6332f Utilities/Release: Drop now-unused scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5234
| * | | | Utilities/Release: Drop now-unused scriptsBrad King2020-09-176-431/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since these commits: * commit ab2276e6b9 (Utilities/Release: remove old macOS release script, 2020-09-16) * commit 7670ba8b0a (Utilities/Release: Drop win{32,64} scripts in favor of docker build, 2020-05-05, v3.18.0-rc1~203^2) * commit 689fdbfc61 (Utilities/Release: Drop linux64 script in favor of docker build, 2019-08-27, v3.16.0-rc1~184^2) several scripts we once used for producing release binaries for distribution on `cmake.org` are no longer needed.
* | | | | Merge branch 'release-3.18'Brad King2020-09-180-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'ninja-multi-automoc-regression' into release-3.18Brad King2020-09-186-7/+28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23fe4b861f Ninja Multi-Config: Fix dependencies of custom commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5238
* | \ \ \ \ Merge topic 'ninja-multi-automoc-regression'Brad King2020-09-186-7/+28
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 23fe4b861f Ninja Multi-Config: Fix dependencies of custom commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5238
| * | | | | Ninja Multi-Config: Fix dependencies of custom commandsKyle Edwards2020-09-176-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9fd3a10 addressed the scenario where the depending target is a utility target, but not the scenario where the dependent target is a utility target. Account for this scenario. Also add a Qt-specific test case. Fixes: #21118
* | | | | | Merge branch 'release-3.18'Brad King2020-09-180-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'FindMatlab-r2020b' into release-3.18Brad King2020-09-181-0/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d292aecb6 FindMatlab: add R2020b => 9.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5233
* | | | | | Merge topic 'FindMatlab-r2020b'Brad King2020-09-181-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d292aecb6 FindMatlab: add R2020b => 9.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5233
| * | | | | FindMatlab: add R2020b => 9.9Michael Hirsch2020-09-171-0/+1
| | |/ / / | |/| | |
* | | | | Merge topic 'ci-macos-package'Brad King2020-09-181-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6dca75fd86 gitlab-ci: minimize pipeline for packaging Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5237
| * | | | | gitlab-ci: minimize pipeline for packagingBrad King2020-09-171-1/+5
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2020-09-181-1/+1
|/ / / / /
* | | | | Merge branch 'release-3.18'Brad King2020-09-170-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'ci-xcode-11.7' into release-3.18Brad King2020-09-171-3/+3
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 53709c764e gitlab-ci: update macOS jobs to use Xcode 11.7 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5236
* | | | | Merge topic 'ci-xcode-11.7'Brad King2020-09-171-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfae54b40c Merge branch 'backport-3.18-ci-xcode-11.7' into ci-xcode-11.7 135a2d26d3 gitlab-ci: update macOS jobs to use Xcode 11.7 53709c764e gitlab-ci: update macOS jobs to use Xcode 11.7 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5236
| * \ \ \ \ Merge branch 'backport-3.18-ci-xcode-11.7' into ci-xcode-11.7Brad King2020-09-170-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | gitlab-ci: update macOS jobs to use Xcode 11.7Brad King2020-09-171-3/+3
| | |/ / /
| * | | | gitlab-ci: update macOS jobs to use Xcode 11.7Brad King2020-09-171-4/+4
|/ / / /
* | | | Merge topic 'ci-package-upload'Brad King2020-09-171-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d747684bbb gitlab-ci: reduce verbosity of binary upload Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5235
| * | | | gitlab-ci: reduce verbosity of binary uploadBrad King2020-09-171-1/+1
| | |/ / | |/| | | | | | | | | | Tell `ssh` not to print informational messages.
* | | | Merge topic 'string-json-support'Brad King2020-09-1718-0/+790
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8eab76eb84 string(JSON): Adds JSON parsing support to the string command Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Acked-by: Cristian Adam <cristian.adam@gmail.com> Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev> Merge-request: !5159
| * | | | string(JSON): Adds JSON parsing support to the string commandPeter Steneteg2020-09-1618-0/+790
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a set of sub commands to the string command for parsing JSON, the JSON commands are: GET, TYPE, MEMBER, LENGTH, REMOVE, SET, and EQUAL. Closes: #19501
* | | | | Merge topic 'finddoxygen-permission-denied'Brad King2020-09-171-7/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 818c6948da FindDoxygen: build the generated file contents using temporary strings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5230
| * | | | | FindDoxygen: build the generated file contents using temporary stringsRonald Hiemstra2020-09-161-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incrementally writing to a file, could result in write (permission denied) errors. Those errors are probably due to file-monitoring processes having a temporary lock on a generated file. The implemented solution builds the content of the generated file as string and in the end the built string is written to the generated file. Fixes: #21190
* | | | | | Merge topic 'findlibxml2_add_names'Brad King2020-09-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa258f175d FindLibXml2 : added libxml2_a to find_library() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5232