Commit Graph

59728 Commits

Author SHA1 Message Date
Alois Klink 6d6baffb85 Tests: Fix ExternalLibraryWithSubstitution test
The ExternalLibraryWithSubstitution test should test whether
BUILD_BYPRODUCTS supports <BUILD_DIR> and other ExternalProject
placeholder tokens.

However, it's not hooked up correctly, and therefore isn't properly
tested. This commit links it to an executable, to confirm whether
it's possible to use the BUILD_BYPRODUCT in the Ninja generator.

Fixes: commit 86032ae0eb (ExternalProject: Replace placeholder tokens in BYPRODUCTS, 2015-03-06)
2022-11-03 23:27:16 +00:00
Alois Klink 4bcfff2df3 ExternalProject: Clarify BYPRODUCTS docs
Clarify that the `BUILD_BYPRODUCTS` and `BYPRODUCTS` options
in ExternalProject may also be required when using the Ninja
generator (as that's one of the primary reasons why you'd want to
use those options).

I've also mentioned that `add_custom_command` has additional
documentation on what `BYPRODUCTS` does.
2022-11-03 15:33:05 +00:00
Brad King 3aa6d79a50 Merge branch 'release-3.25' 2022-11-03 08:19:05 -04:00
Brad King 7299be0765 Merge topic 'ci-swift-5.7'
48ea2ce504 ci: Update debian10-ninja job to use Swift 5.7.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7860
2022-11-03 08:19:04 -04:00
Brad King 48ed0f8a1c Merge topic 'ci-swift-5.7' into release-3.25
48ea2ce504 ci: Update debian10-ninja job to use Swift 5.7.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7860
2022-11-03 08:19:03 -04:00
Brad King 7410e8ea84 Merge branch 'release-3.25' 2022-11-03 08:15:14 -04:00
Brad King 7e94e54f8f Merge topic 'correct_nvptxcompiler_not_linking_to_threads'
62f13ed588 FindCUDAToolkit: Restore usage from multiple directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7859
2022-11-03 08:15:13 -04:00
Brad King 32352abbd1 Merge topic 'correct_nvptxcompiler_not_linking_to_threads' into release-3.25
62f13ed588 FindCUDAToolkit: Restore usage from multiple directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7859
2022-11-03 08:15:12 -04:00
Brad King 2a2a7e452f Merge branch 'release-3.25' 2022-11-03 08:14:15 -04:00
Brad King 55ef776a62 Merge topic 'xcode-swift-include-dirs'
cb4e6702b2 Xcode: Implement Swift include directories
e1ccab12d7 Xcode: Restore Swift framework search directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7858
2022-11-03 08:14:15 -04:00
Brad King 083b319822 Merge topic 'xcode-swift-include-dirs' into release-3.25
cb4e6702b2 Xcode: Implement Swift include directories
e1ccab12d7 Xcode: Restore Swift framework search directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7858
2022-11-03 08:14:14 -04:00
Brad King a451bf1b41 Merge topic 'ci-mingw'
3624295c9b ci: add MSYS Makefiles nightly CI job
01c58daec7 ci: add MinGW Makefiles nightly CI job
88b14c5cf4 Tests: Improve GeneratorExpression SHELL_PATH case robustness on MSYS 1.0
82c990e9be Tests: Improve RunCMake.GetPrerequisites sample executable selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7861
2022-11-03 08:12:14 -04:00
Kitware Robot 260cb58450 CMake Nightly Date Stamp 2022-11-03 00:01:08 -04:00
Brad King 3624295c9b ci: add MSYS Makefiles nightly CI job
Use the MinGW/MSYS 1.0 distribution from `mingw.osdn.io`.
2022-11-02 17:17:02 -04:00
Brad King 01c58daec7 ci: add MinGW Makefiles nightly CI job
Use the MinGW/MSYS 1.0 distribution from `mingw.osdn.io`.
2022-11-02 17:16:46 -04:00
Brad King cb4e6702b2 Xcode: Implement Swift include directories
Populate Xcode's `SWIFT_INCLUDE_PATHS` build setting with the
target-wide include directories.

Issue: #24116
2022-11-02 17:03:21 -04:00
Brad King e1ccab12d7 Xcode: Restore Swift framework search directories
Previously we selected a single "language for preprocessor" with which
to compute both target-wide `GCC_PREPROCESSOR_DEFINITIONS` and
`{HEADER,FRAMEWORK}_SEARCH_PATHS`.  Since commit c0dd3dd2c1 (Xcode:
Evaluate Swift compile definitions separately, 2022-10-25,
v3.25.0-rc3~16^2) we never compute `GCC_PREPROCESSOR_DEFINITIONS` for
Swift.  Therefore we need to select the language for target-wide include
and framework directories separately.

Fixes: #24116
2022-11-02 16:57:36 -04:00
Brad King 88b14c5cf4 Tests: Improve GeneratorExpression SHELL_PATH case robustness on MSYS 1.0
Since commit ca6ba3fee5 (Genex: Add a SHELL_PATH expression, 2015-09-24,
v3.4.0-rc1~37^2) and commit 21da25d2a8 (Tests: Generalize
GeneratorExpression MSYS path conversion workaround, 2019-03-11,
v3.15.0-rc1~407^2~1) we use a prefix string to prevent the MSYS 1.0
shell from converting absolute paths of the form `/c/...` to
windows-style paths.  In the newer `mingw.osdn.io` distribution of MSYS
1.0, the `bash` shell now also converts paths that appear after `:`.
We have no way to add a prefix string in that context, so perform the
test's check of the `SHELL_PATH` genex value at generate time instead.
2022-11-02 15:47:25 -04:00
Brad King 82c990e9be Tests: Improve RunCMake.GetPrerequisites sample executable selection
Get the runtime dependencies of an executable just built by the
toolchain with which tests are running.  Previously we used the `cmake`
binary itself, but that might have been built for a different ABI than
the tested binutils support.
2022-11-02 13:45:05 -04:00
Brad King bf9d3fddcc Merge branch 'release-3.25' 2022-11-02 13:36:49 -04:00
Brad King db6123d66e Merge topic 'IAR-CXX-fix'
73e84a392b IAR: Restore support for CMAKE_CXX_FLAGS_INIT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7857
2022-11-02 13:36:48 -04:00
Brad King 4daf4c3aa9 Merge topic 'IAR-CXX-fix' into release-3.25
73e84a392b IAR: Restore support for CMAKE_CXX_FLAGS_INIT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7857
2022-11-02 13:36:47 -04:00
Brad King 48ea2ce504 ci: Update debian10-ninja job to use Swift 5.7.1 2022-11-02 13:28:52 -04:00
Robert Maynard 62f13ed588 FindCUDAToolkit: Restore usage from multiple directories
Fixes #24119
2022-11-02 12:23:30 -04:00
Kitware Robot 22188cb940 CMake Nightly Date Stamp 2022-11-02 00:01:06 -04:00
Daniel Schürmann 73e84a392b IAR: Restore support for CMAKE_CXX_FLAGS_INIT
Prior to commit a9073db736 (IAR: update language specification
detection, 2021-09-23, v3.22.0-rc1~83^2) the `--c++`/`--eec++` flags
were stored in `CMAKE_IAR_CXX_FLAG` so that they would be used as part
of the `CMAKE_CXX_COMPILE_OBJECT` rule variable.  That commit moved the
flags to `CMAKE_CXX_FLAGS`, which also broke initialization of
`CMAKE_CXX_FLAGS` from `CMAKE_CXX_FLAGS_INIT`.  Restore the original
approach.

Fixes: #24111
2022-11-01 14:59:24 -04:00
Brad King 4fc3f7e88f Merge branch 'release-3.25' 2022-11-01 13:40:37 -04:00
Brad King b45f9b3643 CMake 3.25.0-rc3 v3.25.0-rc3 2022-11-01 13:10:48 -04:00
Brad King dde5ed4b17 Merge branch 'release-3.25' 2022-11-01 12:58:53 -04:00
Brad King 7d63cc5443 Merge branch 'release-3.24' 2022-11-01 12:58:44 -04:00
Brad King 1527534548 Merge branch 'release-3.24' into release-3.25 2022-11-01 12:58:26 -04:00
Brad King c974557598 CMake 3.24.3 v3.24.3 2022-11-01 10:55:49 -04:00
Brad King 31d8c8338d Merge branch 'release-3.25' 2022-11-01 10:41:11 -04:00
Brad King 3f2c14c488 Merge branch 'release-3.24' 2022-11-01 10:41:09 -04:00
Brad King 6aee07edb5 Merge branch 'release-3.23' 2022-11-01 10:41:00 -04:00
Brad King 2c5760ac2c Merge branch 'release-3.24' into release-3.25 2022-11-01 10:40:42 -04:00
Brad King d697bbd03d Merge branch 'release-3.23' into release-3.24 2022-11-01 10:40:34 -04:00
Brad King 91ccfa3302 CMake 3.23.5 v3.23.5 2022-11-01 09:36:33 -04:00
Brad King a9d5a0bf4b Merge topic 'compile-commands-output-field'
887a8874c3 EXPORT_COMPILE_COMMANDS: add `output` field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7844
2022-11-01 09:02:15 -04:00
Brad King ea0d24c701 Merge topic 'test-objc'
bb2370842f Tests: Simplify RunCMake.try_compile compiler inspection
1abcb094a7 Tests: Fix logic to enable RunCMake.try_compile OBJC/OBJCXX cases
b641a80d55 Tests: Factor out a CMake_TEST_OBJC variable for OBJC/OBJCXX test conditions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7855
2022-11-01 09:01:01 -04:00
Brad King df54f1ddf8 Merge topic 'test-eol'
4180159758 Tests: Provide RunCMake.CommandLine compare_files data more robustly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7852
2022-11-01 09:00:13 -04:00
Brad King f5d6c1b2f8 Merge topic 'lcc-cleanup'
a2943d9ec8 Tests: Teach CheckSourceTree test to clean up more specific known files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7850
2022-11-01 08:58:23 -04:00
Brad King 07dbb523d2 Merge topic 'update-nghttp2'
e44b551e8d nghttp2: Update build within CMake to account for 1.50.0
8b73605408 Merge branch 'upstream-nghttp2' into update-nghttp2
7ce2a682a3 nghttp2 2022-09-21 (87fef4ab)
66c9536775 nghttp2: Update script to get nghttp2 1.50.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7856
2022-11-01 08:57:36 -04:00
Brad King 8107da4f9f Merge branch 'release-3.25' 2022-11-01 08:54:58 -04:00
Brad King 923de4b88c Merge topic 'update-curl'
25e9f31878 curl: Set build options the way we need for CMake
9ffe6b0969 Merge branch 'upstream-curl' into update-curl
ec122fff08 curl 2022-10-26 (cd95ee9f)
fa9bbb8627 curl: Update script to get curl 7.86.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7851
2022-11-01 08:54:58 -04:00
Brad King d0787f710d Merge topic 'update-curl' into release-3.25
25e9f31878 curl: Set build options the way we need for CMake
9ffe6b0969 Merge branch 'upstream-curl' into update-curl
ec122fff08 curl 2022-10-26 (cd95ee9f)
fa9bbb8627 curl: Update script to get curl 7.86.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7851
2022-11-01 08:54:56 -04:00
Brad King 2d36046f08 Merge branch 'release-3.25' 2022-11-01 08:53:51 -04:00
Brad King 3f5d8562df Merge topic 'cmp0141-pch-reuse'
183b9a9eca CMP0141: Fix PCH REUSE_FROM under policy NEW behavior
4d13f472a2 Tests: Drop redundant project init from RunCMake.PrecompileHeaders cases
2e65fe92db cmLocalGenerator: Clarify name of local PDB type variable
17096aeba8 cmLocalGenerator: Factor out helper to compute MSVC_DEBUG_INFORMATION_FORMAT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7854
2022-11-01 08:53:51 -04:00
Brad King 033ab3f11b Merge topic 'cmp0141-pch-reuse' into release-3.25
183b9a9eca CMP0141: Fix PCH REUSE_FROM under policy NEW behavior
4d13f472a2 Tests: Drop redundant project init from RunCMake.PrecompileHeaders cases
2e65fe92db cmLocalGenerator: Clarify name of local PDB type variable
17096aeba8 cmLocalGenerator: Factor out helper to compute MSVC_DEBUG_INFORMATION_FORMAT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7854
2022-11-01 08:53:50 -04:00
Brad King 41cd961086 Merge branch 'release-3.25' 2022-11-01 08:52:39 -04:00