Commit Graph

59209 Commits

Author SHA1 Message Date
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
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
Matthew Woehlke
da45136ce3 CMakeTestCXXCompiler.cmake: Improve logging consistency
Use "C++ compiler" rather than "CXX compiler" in certain logging
messages. This improves both internal consistency (as "C++ compiler" was
already used elsewhere) and consistency with e.g. the equivalent logging
for the "Objective-C[++] compiler".
2022-09-28 11:49:01 -04:00
Markus Ferrell
37fceb6fd3 Tutorial: Update step 4 style 2022-09-28 11:38:28 -04:00
Brad King
381fc36880 Merge topic 'use-try_compile-source-from'
41f7b1169a Modules: Use new SOURCES_FROM_* try_compile (2/2)
db76876db5 Modules: Use new SOURCES_FROM_* try_compile (1/2)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7717
2022-09-28 10:42:05 -04:00
Brad King
43a0206dad Merge topic 'vs11-deprecate'
6c1337cb79 Deprecate Visual Studio 11 2012 generator
5faf145a5b Tests: Drop unused files from RunCMake.CommandLine

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7720
2022-09-28 10:40:32 -04:00
Brad King
b9968f3006 Merge topic 'cmake-presets-workflow'
374d82bbcd cmake: Add --workflow mode
e316812884 CMakePresets.json: Add workflow presets to schema

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7711
2022-09-28 10:38:41 -04:00
Matthew Woehlke
f891a75d5c Tests: Test CMakeTest*Compiler.cmake fallbacks
Add tests that explicitly test the fallback tests of the modules which
test for a functional [Obj]C[xx] compiler, bypassing the ABI tests.
Due to the ABI test short-circuiting added by commit 1d21dd0f7c
(enable_language: Assume compiler works if ABI detection compiles,
2020-05-25, v3.18.0-rc1~93^2), this logic is likely not getting tested
otherwise.
2022-09-28 10:27:31 -04:00
Silvio Traversaro
e0a62b84b5 FindGLUT: On Windows and with multiple config generator do not use pkg-config 2022-09-28 09:40:25 +02:00
Kitware Robot
17250fe2c9 CMake Nightly Date Stamp 2022-09-28 00:01:18 -04:00
Matthew Woehlke
41f7b1169a Modules: Use new SOURCES_FROM_* try_compile (2/2)
Modify some additional modules that ship with CMake to use the new
SOURCES_FROM_* arguments to try_compile / try_run as added by commits
cb14ae2b87 (try_compile: Add SOURCE_FROM_{ARG,VAR}, 2022-09-21) and
611d801790 (try_compile: Add SOURCE_FROM_FILE, 2022-09-22). This covers
modules that need to read and alter a template source file, which were
not addressed in the previous commit.

Note that FindOpenACC.cmake does not actually need configure_file
functionality; it appears to have inherited the (gratuitous) use thereof
from FindOpenMP.cmake, with which its code bears significant similarity.
2022-09-27 13:29:52 -04:00
Matthew Woehlke
db76876db5 Modules: Use new SOURCES_FROM_* try_compile (1/2)
Modify some modules that ship with CMake to use the new SOURCES_FROM_*
arguments to try_compile / try_run as added by commits cb14ae2b87
(try_compile: Add SOURCE_FROM_{ARG,VAR}, 2022-09-21) and 611d801790
(try_compile: Add SOURCE_FROM_FILE, 2022-09-22). This covers users which
previously either used an existing file (but sometimes needed to rename
it), or which wrote out their source in entirety. It does NOT cover
users that actually need configure_file functionality, as those will be
more involved to update and will thus be tackled in part 2.
2022-09-27 13:29:52 -04:00
Brad King
6c1337cb79 Deprecate Visual Studio 11 2012 generator
Update documentation to mark the generator deprecated.  Add a warning at
the end of generation plus an option to turn off the warning.
2022-09-27 11:45:50 -04:00
Brad King
5faf145a5b Tests: Drop unused files from RunCMake.CommandLine
Remove files missed by commit 8d6f015d59 (Drop Visual Studio 10 2010
generator, 2022-09-26).
2022-09-27 11:45:29 -04:00
Kyle Edwards
374d82bbcd cmake: Add --workflow mode
Fixes: #23118
2022-09-27 11:09:06 -04:00
Brad King
164a156c7c Merge topic 'remove-vs10-generator'
8d6f015d59 Drop Visual Studio 10 2010 generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7718
2022-09-27 10:32:11 -04:00
Brad King
2992d4057a Merge topic 'drop-try_run-macro'
4b2e765025 Drop try_run macro from CMake's own build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7719
2022-09-27 10:31:13 -04:00
Brad King
50b668ddc8 Merge topic 'add_subdirectory_system'
2eb30a7036 add_subdirectory: Add SYSTEM option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7399
2022-09-27 10:28:49 -04:00
Brad King
954b861dba Merge topic 'cpack-nsis-arguments-command-line'
d1613ac880 CPack/NSIS: Add options to set makensis arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7715
2022-09-27 10:26:12 -04:00