Commit Graph

49889 Commits

Author SHA1 Message Date
Kitware Robot 97ff10d337 CMake Nightly Date Stamp 2020-09-22 00:01:28 -04:00
Brad King 64901e053b Merge topic 'xcode-12-new-build-system'
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
2020-09-21 09:10:48 -04:00
Brad King c622cfdfff Merge branch 'release-3.18' 2020-09-21 08:55:29 -04:00
Brad King ca5e309940 Merge topic 'foreach-int-parse-range-check'
0412b55b83 foreach: Fix crash parsing integer out of range

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5239
2020-09-21 08:55:29 -04:00
Brad King c9bc062632 Merge topic 'foreach-int-parse-range-check' into release-3.18
0412b55b83 foreach: Fix crash parsing integer out of range

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5239
2020-09-21 08:55:29 -04:00
Kitware Robot 4abf0747fc CMake Nightly Date Stamp 2020-09-21 00:01:28 -04:00
Kitware Robot 39a5c0c82c CMake Nightly Date Stamp 2020-09-20 00:01:12 -04:00
Kitware Robot a37c0a543a CMake Nightly Date Stamp 2020-09-19 00:01:21 -04:00
Brad King b8ecd4df5f ExternalProject: Use CMP0114 NEW behavior with Xcode "new build system"
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.
2020-09-18 13:46:45 -04:00
Brad King fe258f6382 Tests: Skip RunCMake.XcodeProject device cases for Xcode "new build system"
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
2020-09-18 13:46:39 -04:00
Brad King 1c3d2d0951 Tests: Skip Qt*Autogen.MocSkipSource case for Xcode "new build system"
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
2020-09-18 13:46:39 -04:00
Brad King 542884e527 Tests: Update RunCMake.XcodeProject cases for Xcode "new build system" 2020-09-18 13:02:20 -04:00
Brad King 832a78be2d Tests: Update BuildDepends test for Xcode "new build system"
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.
2020-09-18 13:02:19 -04:00
Brad King ff76c51ec3 Tests: Update RunCMake.file case with workaround for Xcode "new build system" 2020-09-18 13:02:19 -04:00
Brad King 1806cdd17c Tests: Avoid duplicate custom commands for Xcode "new build system" 2020-09-18 13:02:19 -04:00
Brad King 8d5f4c4db9 Xcode: Switch to the "new build system" for Xcode 12 and above
Provide an option to switch back to the original build system via
`-T buildsystem=1`.

Fixes: #18088
2020-09-18 13:02:14 -04:00
Brad King 2db623f554 Xcode: Add option to specify build system variant
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.
2020-09-18 12:49:17 -04:00
Brad King 3ab18c870d Xcode: Factor out build phase variable declarations 2020-09-18 12:49:17 -04:00
Brad King 0d03717996 Xcode: Clarify name of legacy run script build phase helper 2020-09-18 12:49:17 -04:00
Brad King 5a15fcf597 Tests: Avoid duplicate custom commands in QtAutogen.AutogenOriginDependsOff 2020-09-18 12:49:09 -04:00
Ben McMorran 0412b55b83 foreach: Fix crash parsing integer out of range 2020-09-18 09:54:58 -04:00
Brad King ce89f54ee3 Merge topic 'rel-drop-old'
6a88e6332f Utilities/Release: Drop now-unused scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5234
2020-09-18 08:43:13 -04:00
Brad King f332b05666 Merge topic 'ninja-multi-automoc-regression' into release-3.18
23fe4b861f Ninja Multi-Config: Fix dependencies of custom commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5238
2020-09-18 08:42:28 -04:00
Brad King 9472ed34e9 Merge branch 'release-3.18' 2020-09-18 08:42:28 -04:00
Brad King 5d952fd6e2 Merge topic 'ninja-multi-automoc-regression'
23fe4b861f Ninja Multi-Config: Fix dependencies of custom commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5238
2020-09-18 08:42:28 -04:00
Brad King ded92f69fe Merge topic 'FindMatlab-r2020b' into release-3.18
4d292aecb6 FindMatlab: add R2020b => 9.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5233
2020-09-18 08:41:08 -04:00
Brad King edb9e34027 Merge branch 'release-3.18' 2020-09-18 08:41:08 -04:00
Brad King bdd0e28782 Merge topic 'FindMatlab-r2020b'
4d292aecb6 FindMatlab: add R2020b => 9.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5233
2020-09-18 08:41:08 -04:00
Brad King 5b2ec8c612 Merge topic 'ci-macos-package'
6dca75fd86 gitlab-ci: minimize pipeline for packaging

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5237
2020-09-18 08:35:39 -04:00
Kitware Robot c829dc4bfa CMake Nightly Date Stamp 2020-09-18 00:01:23 -04:00
Kyle Edwards 23fe4b861f Ninja Multi-Config: Fix dependencies of custom commands
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
2020-09-17 15:46:57 -04:00
Brad King 6dca75fd86 gitlab-ci: minimize pipeline for packaging 2020-09-17 13:12:30 -04:00
Brad King ac487f870b Merge topic 'ci-xcode-11.7' into release-3.18
53709c764e gitlab-ci: update macOS jobs to use Xcode 11.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5236
2020-09-17 13:00:37 -04:00
Brad King 4fc07cd369 Merge branch 'release-3.18' 2020-09-17 13:00:37 -04:00
Brad King d12fd8e84f Merge topic 'ci-xcode-11.7'
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
2020-09-17 13:00:37 -04:00
Brad King bfae54b40c Merge branch 'backport-3.18-ci-xcode-11.7' into ci-xcode-11.7 2020-09-17 11:28:15 -04:00
Brad King 135a2d26d3 gitlab-ci: update macOS jobs to use Xcode 11.7 2020-09-17 11:27:17 -04:00
Brad King 53709c764e gitlab-ci: update macOS jobs to use Xcode 11.7 2020-09-17 11:26:22 -04:00
Brad King 46bb6ae8d4 Merge topic 'ci-package-upload'
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
2020-09-17 10:28:39 -04:00
Brad King d747684bbb gitlab-ci: reduce verbosity of binary upload
Tell `ssh` not to print informational messages.
2020-09-17 10:12:48 -04:00
Brad King bb8afa0020 Merge topic 'string-json-support'
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
2020-09-17 09:47:43 -04:00
Brad King 5e53b58c4a Merge topic 'finddoxygen-permission-denied'
818c6948da FindDoxygen: build the generated file contents using temporary strings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5230
2020-09-17 09:46:42 -04:00
Brad King 4be10a328a Merge topic 'findlibxml2_add_names'
fa258f175d FindLibXml2 : added libxml2_a to find_library()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5232
2020-09-17 09:45:50 -04:00
Brad King 56c80c8c6d Merge topic 'system-includes-for-clang-on-windows'
bb61c2d024 Clang: use -imsvc for system include dirs when running on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Acked-by: Thomas Bernard <thomas@famillebernardgouriou.fr>
Merge-request: !5231
2020-09-17 09:44:55 -04:00
Brad King 6a88e6332f Utilities/Release: Drop now-unused scripts
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.
2020-09-17 09:11:03 -04:00
Michael Hirsch 4d292aecb6 FindMatlab: add R2020b => 9.9 2020-09-17 08:58:21 -04:00
Kitware Robot bdc752e3d5 CMake Nightly Date Stamp 2020-09-17 00:01:17 -04:00
Brad King 10e7aff716 Merge topic 'ci-macos-package'
ab2276e6b9 Utilities/Release: remove old macOS release script
9671282bcc gitlab-ci: add a job to upload macOS binaries
5138be9558 ci: use a pre-built Qt for macOS packages
8ff3ce730d gitlab-ci: add a job to make macOS packages
7d4ec05c6f gitlab-ci: add a job to make a doc "bundle"
f0aaf24f08 gitlab-ci: always place the build directory at the top
3a96ea903f ci: remove extra newline
758a8592ed Utilities: also support an already extracted doc tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5227
2020-09-16 16:20:19 -04:00
Ben Boeckel ab2276e6b9 Utilities/Release: remove old macOS release script
macOS releases are now made by GitLab-CI.
2020-09-16 16:09:01 -04:00
Ben Boeckel 9671282bcc gitlab-ci: add a job to upload macOS binaries 2020-09-16 16:09:01 -04:00