Commit Graph

59748 Commits

Author SHA1 Message Date
Kitware Robot 322eed615c CMake Nightly Date Stamp 2022-11-07 00:01:16 -05:00
Kitware Robot 890d447923 CMake Nightly Date Stamp 2022-11-06 00:01:05 -04:00
Kitware Robot 7988cb25c1 CMake Nightly Date Stamp 2022-11-05 00:01:09 -04:00
Brad King b46f582bc3 Merge branch 'release-3.25' 2022-11-04 11:28:24 -04:00
Brad King c3b660710c Merge topic 'tasking-pic'
7e612977b9 Tasking: Fix PIC option for Tasking Toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Christoph Seitz <christoph.seitz@posteo.de>
Merge-request: !7862
2022-11-04 11:28:24 -04:00
Brad King 7c52e9e951 Merge topic 'tasking-pic' into release-3.25
7e612977b9 Tasking: Fix PIC option for Tasking Toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Christoph Seitz <christoph.seitz@posteo.de>
Merge-request: !7862
2022-11-04 11:28:23 -04:00
Brad King 6a33f63807 Merge branch 'release-3.25' 2022-11-04 11:27:00 -04:00
Brad King dd8065fdda Merge topic 'vs-default-toolset'
c50df859c5 VS: Restore support for two-part default toolset version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7864
2022-11-04 11:27:00 -04:00
Brad King 6a999992df Merge topic 'vs-default-toolset' into release-3.25
c50df859c5 VS: Restore support for two-part default toolset version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7864
2022-11-04 11:26:59 -04:00
Brad King def28893f1 Merge branch 'release-3.25' 2022-11-04 11:25:07 -04:00
Brad King e9c2f98fd3 Merge branch 'release-3.24' 2022-11-04 11:25:05 -04:00
Brad King 392f53c022 Merge branch 'release-3.24' into release-3.25 2022-11-04 11:24:54 -04:00
Brad King 10a31b11ed Merge branch 'release-3.25' 2022-11-04 11:24:20 -04:00
Brad King d332a2c71e Merge topic 'ci-xcode-14.1'
0d3d687067 gitlab-ci: update macOS jobs to use Xcode 14.1
9684a589ca Source: Replace uses of sprintf with safer snprintf in CMake 3.24 branch
eea23d21a3 Source: Tell Git not to check whitespace in third-party curses form code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7863
2022-11-04 11:24:20 -04:00
Brad King 8ad7e55308 Merge topic 'ci-xcode-14.1' into release-3.25
0d3d687067 gitlab-ci: update macOS jobs to use Xcode 14.1
9684a589ca Source: Replace uses of sprintf with safer snprintf in CMake 3.24 branch
eea23d21a3 Source: Tell Git not to check whitespace in third-party curses form code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7863
2022-11-04 11:24:19 -04:00
Kitware Robot 182ef53d3d CMake Nightly Date Stamp 2022-11-04 00:01:05 -04:00
Brad King 2780c3c683 Merge branch 'ci-xcode-14.1' into release-3.24
Merge-request: !7863
2022-11-03 12:02:05 -04:00
Brad King 0d3d687067 gitlab-ci: update macOS jobs to use Xcode 14.1 2022-11-03 11:58:31 -04:00
Sean McBride 9684a589ca Source: Replace uses of sprintf with safer snprintf in CMake 3.24 branch
Backport commit d5694e4623 (Source: Replace uses of sprintf with safer
snprintf, 2022-06-17, v3.25.0-rc1~587^2) to the CMake 3.24 branch. This
is needed to compile without warnings using Xcode 14.1's macOS 13.0 SDK.
2022-11-03 11:58:31 -04:00
Brad King eea23d21a3 Source: Tell Git not to check whitespace in third-party curses form code 2022-11-03 11:58:30 -04:00
Brad King c50df859c5 VS: Restore support for two-part default toolset version
Since commit f972e4fd3a (cmVSGenerator: Add support for two-part toolset
versions for Visual Studio, 2022-09-01, v3.25.0-rc1~180^2), if a
two-part toolset version is requested, we fail early if globbing finds
no auxiliary toolsets with that version.  This broke our existing
support for detecting when the default toolset matches the two-part
version requested.  Fix the logic to ignore the two-part globbing
results if they are empty so we fall through to checking the default
version.

Fixes: #24107
2022-11-03 11:39:30 -04:00
Gordon Jess 7e612977b9 Tasking: Fix PIC option for Tasking Toolset
Fixes: #24114
2022-11-03 08:57:20 -04: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