Commit Graph

59226 Commits

Author SHA1 Message Date
Brad King
c23ebfa333 ci: Tell Git to ignore files known to be downloaded by jobs 2022-10-05 12:22:49 -04:00
Brad King
6ace9562e7 Merge topic 'fedora-iwyu'
c239e7c259 ci: add include-what-you-use to Fedora base image

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7744
2022-10-05 09:22:09 -04:00
Kitware Robot
f2a4d7b2c3 CMake Nightly Date Stamp 2022-10-05 00:01:12 -04:00
Brad King
d59a3ce449 Merge branch 'release-3.24' 2022-10-04 14:23:28 -04:00
Brad King
1394e8e7c1 Merge branch 'release-3.23' 2022-10-04 14:23:17 -04:00
Brad King
8cadea4f47 Merge branch 'release-3.23' into release-3.24 2022-10-04 14:23:00 -04:00
Kyle Edwards
c239e7c259 ci: add include-what-you-use to Fedora base image 2022-10-04 13:30:52 -04:00
Brad King
34a6da34b8 CMake 3.23.4 v3.23.4 2022-10-04 13:26:33 -04:00
Brad King
5fec2ea078 Merge topic 'ci-intel-compiler'
f391c1c269 gitlab-ci: add jobs testing Intel 2022.2.0 compilers on Linux
29e45a94b0 Tests: Teach RunCMake to ignore Intel Classic compiler deprecation warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7742
2022-10-04 10:32:26 -04:00
Brad King
15ad39575e Merge topic 'FindGDAL-debug-msvc'
fdc95c6d19 FindGDAL: Add library name for MSVC Debug GDAL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7737
2022-10-04 10:31:02 -04:00
Brad King
70234f91b3 Merge topic 'xcode-ios-objects'
25630863ea Tests: Add case covering XCODE_EMIT_EFFECTIVE_PLATFORM_NAME=OFF for iOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7740
2022-10-04 10:29:54 -04:00
Brad King
5e53164acf Merge topic 'improve-try_compile-debug-documentation'
3801785cc3 Help: Improve try_compile debug documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !7735
2022-10-04 10:28:32 -04:00
Brad King
6755539fca Merge topic 'fix-try_compile-doc-typo'
ef05a56387 Help: Fix typo in try_compile documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7736
2022-10-04 10:27:40 -04:00
Brad King
7bea75f1fa Merge topic 'try_compile-rename-source_from_arg'
0f28653ba9 try_compile: Rename SOURCE_FROM_ARG -> SOURCE_FROM_CONTENT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7733
2022-10-04 10:26:34 -04:00
Kitware Robot
a3252ac53e CMake Nightly Date Stamp 2022-10-04 00:01:15 -04:00
Brad King
f391c1c269 gitlab-ci: add jobs testing Intel 2022.2.0 compilers on Linux
Note that the classic compiler version is 2021.7.0, but we still
have it in the 2022.2.0 base image.
2022-10-03 17:51:17 -04:00
Brad King
29e45a94b0 Tests: Teach RunCMake to ignore Intel Classic compiler deprecation warnings 2022-10-03 17:51:11 -04:00
Brad King
25630863ea Tests: Add case covering XCODE_EMIT_EFFECTIVE_PLATFORM_NAME=OFF for iOS
This use case was fixed by commit a7fb4bc475 (Xcode: Set build product
locations using CONFIGURATION_BUILD_DIR, 2022-09-28).  Add a test to
verify the fix.

Fixes: #23970
2022-10-03 12:41:59 -04:00
Matthew Woehlke
3801785cc3 Help: Improve try_compile debug documentation
Update the --debug-trycompile documentation to account for recent
changes to try_compile. Mention where in the build tree to find
artifacts when using said option.
2022-10-03 11:44:58 -04:00
Gregoire Krähenbühl
fdc95c6d19 FindGDAL: Add library name for MSVC Debug GDAL
Search for `gdald.lib`, which is how the library is now named when built
with CMake under MSVC Debug.

Fixes: #24015
2022-10-03 10:52:58 -04:00
Brad King
6abd40b979 Merge topic 'ExternalProject-git-dir'
e07039cd26 ExternalProject: Explicitly run Git commands on intended directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7731
2022-10-03 10:33:09 -04:00
Brad King
24bb34b587 Merge branch 'release-3.24' 2022-10-03 10:31:27 -04:00
Brad King
42c0428e5f Merge topic 'ci-xcode-14.0'
9cdf4c9be4 gitlab-ci: update macOS jobs to use Xcode 14.0
5d2c2b2558 Tests: Update RunCMake.XcodeProject iOS cases for Xcode 14.0
12c6fec6b4 Xcode: Drop CMAKE_INTDIR= definition in Swift targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7732
2022-10-03 10:31:27 -04:00
Brad King
a5e2597cea Merge topic 'ci-xcode-14.0' into release-3.24
9cdf4c9be4 gitlab-ci: update macOS jobs to use Xcode 14.0
5d2c2b2558 Tests: Update RunCMake.XcodeProject iOS cases for Xcode 14.0
12c6fec6b4 Xcode: Drop CMAKE_INTDIR= definition in Swift targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7732
2022-10-03 10:31:26 -04:00
Kitware Robot
6533383134 CMake Nightly Date Stamp 2022-10-03 00:01:15 -04:00
Kitware Robot
8251cdfe39 CMake Nightly Date Stamp 2022-10-02 00:01:11 -04:00
Kitware Robot
89965c855d CMake Nightly Date Stamp 2022-10-01 00:01:16 -04:00
Matthew Woehlke
ef05a56387 Help: Fix typo in try_compile documentation 2022-09-30 15:49:35 -04:00
Matthew Woehlke
0f28653ba9 try_compile: Rename SOURCE_FROM_ARG -> SOURCE_FROM_CONTENT
Change the SOURCE_FROM_ARG keyword to try_compile to SOURCE_FROM_CONTENT
(which we can do because it was recently added and hasn't been in a
release yet). The new name should be clearer as to what it does, and
also more consistent with the CONTENT arguments to some other commands.

Also, fix a typo in an error message.
2022-09-30 14:50:25 -04:00
Brad King
9cdf4c9be4 gitlab-ci: update macOS jobs to use Xcode 14.0 2022-09-30 13:08:06 -04:00
Brad King
5d2c2b2558 Tests: Update RunCMake.XcodeProject iOS cases for Xcode 14.0
Issue: #24011
2022-09-30 13:08:05 -04:00
Brad King
12c6fec6b4 Xcode: Drop CMAKE_INTDIR= definition in Swift targets
Xcode 14.0 warns that Swift doesn't support definition values.
Therefore `CMAKE_INTDIR` is not useful to Swift sources.  Drop it.
2022-09-30 13:08:05 -04:00
Patrick Stewart
e07039cd26 ExternalProject: Explicitly run Git commands on intended directory
Add `--git-dir=.git` to cause git commands to fail instantly if the
`.git` folder has gone missing.

Fixes: #24007
2022-09-30 07:31:49 -04:00
Brad King
c7170651f4 Merge topic 'xcode-build-layout'
d0a6ebf57b Xcode: Fix "clean" operation under the "new build system"
dc5fc898f6 Xcode: Set object file locations using TARGET_TEMP_DIR
a7fb4bc475 Xcode: Set build product locations using CONFIGURATION_BUILD_DIR
6883b82124 cmGlobalXCodeGenerator: Remove unused local variable settings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7730
2022-09-30 07:24:48 -04:00
Brad King
e02204d894 Merge topic 'compiler-tests'
586c2ab4f1 Tests: Test more CMakeTest*Compiler.cmake fallbacks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7727
2022-09-30 07:19:55 -04:00
Brad King
5ff1b77690 Merge topic 'revert-ci-debian10-clang-tidy-headers'
9c8c965435 ci: Revert "add clang-tidy to Debian x86_64 base image"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !7729
2022-09-30 07:15:42 -04:00
Kitware Robot
f6fe3a40f2 CMake Nightly Date Stamp 2022-09-30 00:01:12 -04:00
Brad King
d0a6ebf57b Xcode: Fix "clean" operation under the "new build system"
Previously we set `SYMROOT` to tell Xcode where to place the build
products.  However, the "clean" operation in the Xcode "new build
system" expects that only Xcode creates the `SYMROOT` directory or
contents inside it.  Since we create that directory, "clean" fails.

We now explicitly set `CONFIGURATION_BUILD_DIR` and `TARGET_TEMP_DIR`
instead of letting Xcode compute their values from `SYMROOT`, so we no
longer need to set the latter.  Drop the now-unnecessary `SYMROOT`.

Fixes: #22550
2022-09-29 15:04:08 -04:00
Brad King
dc5fc898f6 Xcode: Set object file locations using TARGET_TEMP_DIR
This avoids relying on `SYMROOT` to locate the object files.

Issue: #22550
2022-09-29 15:04:07 -04:00
Brad King
a7fb4bc475 Xcode: Set build product locations using CONFIGURATION_BUILD_DIR
Since commit 59a2265576 (Xcode: Use EFFECTIVE_PLATFORM_NAME reference in
ComputeOutputDir, 2011-08-12, v2.8.6~43^2~1) we can now set the build
products path using `CONFIGURATION_BUILD_DIR` unconditionally because we
compute the correct value even when using `EFFECTIVE_PLATFORM_NAME`.
This avoids relying on `SYMROOT` to locate the build products.

Issue: #22550
2022-09-29 15:03:37 -04:00
Brad King
6883b82124 cmGlobalXCodeGenerator: Remove unused local variable settings 2022-09-29 14:26:51 -04:00
Brad King
9c8c965435 ci: Revert "add clang-tidy to Debian x86_64 base image"
Revert commit 0ac9ec47f6 (ci: add clang-tidy to Debian x86_64 base
image, 2022-09-20).  Our clang-tidy job runs under Fedora, and we need
the plugin to compile there anyway, so lints like IWYU will best be done
in the Fedora image.

Issue: #23912
2022-09-29 11:19:42 -04:00
Brad King
586c2ab4f1 Tests: Test more CMakeTest*Compiler.cmake fallbacks
Extend the test added by commit f891a75d5c (Tests: Test
CMakeTest*Compiler.cmake fallbacks, 2022-09-27) to cover more languages.
2022-09-29 09:26:23 -04:00
Brad King
cadcb6a5f0 Merge topic 'try_compile-no-cache'
09b3051524 try_compile: Add NO_CACHE option (also try_run)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7723
2022-09-29 07:59:02 -04:00
Brad King
b1ecce8ae7 Merge topic 'traversaro-master-patch-54928'
e0a62b84b5 FindGLUT: On Windows and with multiple config generator do not use pkg-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7721
2022-09-29 07:54:50 -04:00
Brad King
beb4f5df47 Merge topic 'tutorial_step4_update'
37fceb6fd3 Tutorial: Update step 4 style

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7646
2022-09-29 07:54:05 -04:00
Brad King
f9fb962851 Merge topic 'fix-compiler-test-message'
da45136ce3 CMakeTestCXXCompiler.cmake: Improve logging consistency

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7724
2022-09-29 07:52:25 -04:00
Brad King
9c9c7d68cb Merge topic 'compiler-tests'
f891a75d5c Tests: Test CMakeTest*Compiler.cmake fallbacks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7722
2022-09-29 07:50:54 -04:00
Kitware Robot
0fb136c1a6 CMake Nightly Date Stamp 2022-09-29 00:01:14 -04:00
Matthew Woehlke
09b3051524 try_compile: Add NO_CACHE option (also try_run)
Add NO_CACHE option to try_compile and try_run, which places the results
in regular, rather than cache, variables.

Issue: #22799
2022-09-28 13:41:11 -04:00