mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 02:19:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
64,805 Commits 2 Branches 401 Tags
0d451ea92b1e01e8f3c780dee558bcfd2c4d342e
Commit Graph

64805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 0d451ea92b Merge branch 'release-3.28' 2024-02-05 11:05:51 -05:00
Brad King 5e984bb352 CMake 3.28.3 v3.28.3 2024-02-05 10:28:25 -05:00
Brad King e33ca9ee83 Merge topic 'doc-SOVERSION-first-component-VERSION' 
fcab4bee21 Help: Document conventional VERSION/SOVERSION relationship

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9177
 2024-02-05 09:58:40 -05:00
Brad King f81e16af53 Merge branch 'release-3.28' 2024-02-05 09:57:19 -05:00
Brad King 666d2e6451 Merge topic 'restore-pch-with-unity' 
30829da506 Unity: Clarify source comments on unity build transformation
87bf1c6c33 Merge branch 'unity-after-compile-features' into restore-pch-with-unity
df08c37a42 cmGlobalGenerator: Add unity/pch sources after computing compile features
004c3c3986 Tests: Add case covering PCH in a unity build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9215
 2024-02-05 09:57:19 -05:00
Brad King 292d808a3a Merge topic 'restore-pch-with-unity' into release-3.28 
30829da506 Unity: Clarify source comments on unity build transformation
87bf1c6c33 Merge branch 'unity-after-compile-features' into restore-pch-with-unity
df08c37a42 cmGlobalGenerator: Add unity/pch sources after computing compile features
004c3c3986 Tests: Add case covering PCH in a unity build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9215
 2024-02-05 09:57:17 -05:00
Kitware Robot ae667813de CMake Nightly Date Stamp 2024-02-05 00:01:36 -05:00
Kitware Robot b29fdbca36 CMake Nightly Date Stamp 2024-02-04 00:01:08 -05:00
Kitware Robot ba17f5a8d1 CMake Nightly Date Stamp 2024-02-03 00:01:11 -05:00
Brad King cc0c31e79f Merge topic 'GoogleTest-test-launcher' 
f875c479f5 GoogleTest: Honor TEST_LAUNCHER in gtest_discover_tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9174
 2024-02-02 10:57:55 -05:00
Brad King 1bbec7927d Merge topic 'update-curl' 
01a9325027 Tests: Match curl 8.6.0 error in RunCMake.ctest_submit FailDrop-https case
e28ea90c1b Merge branch 'upstream-curl' into update-curl
851cc904a0 curl 2024-01-31 (5ce164e0)
692463d271 curl: Update script to get curl 8.6.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9207
 2024-02-02 10:41:04 -05:00
Brad King b8ee9db223 Merge topic 'msys-system-name' 
607051f266 MSYS,CYGWIN: Hard-code host system names when built for these runtimes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Peter Kokot <peterkokot@gmail.com>
Merge-request: !9213
 2024-02-02 10:28:54 -05:00
Brad King 8d01a388f1 Merge topic 'FindOpenACC' 
30962830dc FindOpenACC: Add support for the Clang Compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9212
 2024-02-02 10:24:23 -05:00
Brad King 30829da506 Unity: Clarify source comments on unity build transformation 2024-02-02 09:43:27 -05:00
Brad King 87bf1c6c33 Merge branch 'unity-after-compile-features' into restore-pch-with-unity 
Replace commit 76b5383123 (cmGlobalGenerator: add unity sources after
computing target compile features, 2024-01-01, v3.28.2~17^2~1) with an
alternative change.  This merge commit resolves conflicts such that
future `git blame` calls will follow the second parent for the relevant
lines and pretend the replaced commit never existed.

Fixes: #25650
 2024-02-02 09:43:15 -05:00
Brad King df08c37a42 cmGlobalGenerator: Add unity/pch sources after computing compile features 
Sources that will be scanned for C++ module dependencies need to be
excluded from unity builds.  We need to compute compile features in
order to know which sources will be scanned.  Unity build and PCH
sources can be added afterward without changing the compile features.

This re-implements commit 76b5383123 (cmGlobalGenerator: add unity
sources after computing target compile features, 2024-01-01,
v3.28.2~17^2~1) using a simpler approach that also preserves support for
PCH with Unity builds.

Issue: #25650
Co-authored-by: Ben Boeckel <ben.boeckel@kitware.com>
 2024-02-02 09:39:13 -05:00
Brad King 004c3c3986 Tests: Add case covering PCH in a unity build 
Issue: #25650
 2024-02-02 08:14:21 -05:00
Kitware Robot 2c3509136f CMake Nightly Date Stamp 2024-02-02 00:01:09 -05:00
Brad King 607051f266 MSYS,CYGWIN: Hard-code host system names when built for these runtimes 
When CMake is built against the MSYS runtime library, `uname()` returns
a name that depends on the `MSYSTEM` environment variable.  Previously
we truncated `MSYS_...` to just `MSYS`, but outside `MSYSTEM=MSYS`
environments, names like `MINGW64_NT-10.0-22000` were reported.

The latter causes CMake to report an unsupported-platform error, which
users report as an issue when the real problem is that they should be
using a `MSYSTEM=MSYS` environment or a CMake that is not built against
the MSYS runtime.

For our purposes, if CMake is built against the MSYS runtime, the host
platform is always `MSYS`.  Similarly for `CYGWIN`.
 2024-02-01 11:48:32 -05:00
Aaron Jarmusch 30962830dc FindOpenACC: Add support for the Clang Compiler 2024-02-01 07:28:00 -08:00
Brad King 58d424bca1 Merge topic 'add_custom_command-target-alias' 
3b07ec631d add_custom_command: Allow adding build event via ALIAS target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9201
 2024-02-01 08:32:20 -05:00
Brad King 3cabf45a99 Merge topic 'cuda-clang-windows' 
899c8d7b21 CUDA/Clang: Fail early when mixing clang++ with cl on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9209
 2024-02-01 08:31:19 -05:00
Chen Linxuan 3b07ec631d add_custom_command: Allow adding build event via ALIAS target 
Signed-off-by: Chen Linxuan <me@black-desk.cn>
 2024-02-01 08:21:41 -05:00
Brad King 9f362ae26d Merge topic 'test-fortran' 
8dd9554d24 Tests: Enable Fortran part of CompileOptions test on single-config generators
0a5d29159e Tests: Add "Fortran" test label

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9208
 2024-02-01 08:17:51 -05:00
Brad King b1a5c08139 Merge topic 'cross-compiling-init' 
79ce5ef4e0 CMakeDetermineSystem: Simplify cross-compiling logging decision
0b181cec03 CMakeDetermineSystem: Clarify comment when CMAKE_SYSTEM_NAME is already set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9206
 2024-02-01 08:15:59 -05:00
Brad King 01a9325027 Tests: Match curl 8.6.0 error in RunCMake.ctest_submit FailDrop-https case 2024-02-01 08:09:21 -05:00
Kitware Robot 2ff91f5fc4 CMake Nightly Date Stamp 2024-02-01 00:01:07 -05:00
Brad King 8dd9554d24 Tests: Enable Fortran part of CompileOptions test on single-config generators 2024-01-31 14:51:56 -05:00
Brad King 899c8d7b21 CUDA/Clang: Fail early when mixing clang++ with cl on Windows 
In commit 88c740462c (CUDA/Clang: Add support for MSVC ABI on Windows
using GNU-like frontend, 2024-01-17) we updated the message for the
existing check to mention CUDA, but neglected to update the check
itself.

Issue: #25648
 2024-01-31 14:42:34 -05:00
Brad King 0a5d29159e Tests: Add "Fortran" test label 
With this, `ctest -L Fortran` will run only tests covering Fortran.
 2024-01-31 11:27:53 -05:00
Brad King e28ea90c1b Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2024-01-31 (5ce164e0)
 2024-01-31 10:02:45 -05:00
Curl Upstream 851cc904a0 curl 2024-01-31 (5ce164e0) 
Code extracted from:

    https://github.com/curl/curl.git

at commit 5ce164e0e9290c96eb7d502173426c0a135ec008 (curl-8_6_0).
 2024-01-31 10:02:06 -05:00
Brad King 692463d271 curl: Update script to get curl 8.6.0 2024-01-31 10:01:53 -05:00
Sune Stolborg Vuorela fcab4bee21 Help: Document conventional VERSION/SOVERSION relationship 
Issue: #25626
 2024-01-31 09:52:07 -05:00
Brad King 16b1f0c3e9 Merge topic 'env-cmake-install-prefix' 
06af18b9db cmake: Allow CMAKE_INSTALL_PREFIX to be set by environment variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9200
 2024-01-31 09:03:21 -05:00
Brad King 2a00813842 Merge topic 'xcode-pch-swift-cxx' 
77c4d2f9a2 Xcode: Fix PCH support with Swift & C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9203
 2024-01-31 09:01:45 -05:00
Brad King eb9124bd19 Merge branch 'release-3.28' 2024-01-31 09:00:02 -05:00
Brad King a8bd4a7140 Merge topic 'update-zlib' 
22a52526e2 Merge branch 'upstream-zlib' into update-zlib
6c2bed54f6 zlib 2022-10-12 (04f42cec)
e868b19ed1 zlib: Fix 1.2.13 version and date notice

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9204
 2024-01-31 09:00:02 -05:00
Brad King 817e309af5 Merge topic 'update-zlib' into release-3.28 
22a52526e2 Merge branch 'upstream-zlib' into update-zlib
6c2bed54f6 zlib 2022-10-12 (04f42cec)
e868b19ed1 zlib: Fix 1.2.13 version and date notice

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9204
 2024-01-31 09:00:01 -05:00
Ralf Habacker f875c479f5 GoogleTest: Honor TEST_LAUNCHER in gtest_discover_tests 
We run test executables to discover tests.  Use the same launchers that
are used to run the tests.  We already handle `CROSSCOMPILING_EMULATOR`.
Update the logic to account for the `TEST_LAUNCHER` property added by
commit 1ec0372ed4 (add_test: Optionally use a launcher for tests running
in-project targets, 2023-11-11), and for the `CROSSCOMPILING_EMULATOR`
behavior change in commit ca5a300d7f (add_test: Honor
CROSSCOMPILING_EMULATOR only when cross-compiling, 2023-11-02).

Fixes: #25603
Co-authored-by: Brad King <brad.king@kitware.com>
Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
 2024-01-31 08:33:15 -05:00
Kitware Robot 4584cfeb48 CMake Nightly Date Stamp 2024-01-31 00:01:10 -05:00
Mikko Lehtonen 77c4d2f9a2 Xcode: Fix PCH support with Swift & C++ 
Previously, when a mixed language target ends up with `Swift` as the
`LINKER_LANGUAGE`, the PCH file was not set for the target at all.

Fixes: #21224
 2024-01-30 12:50:40 -05:00
Pavel Ferencz 79ce5ef4e0 CMakeDetermineSystem: Simplify cross-compiling logging decision 2024-01-30 12:25:50 -05:00
Brad King 0b181cec03 CMakeDetermineSystem: Clarify comment when CMAKE_SYSTEM_NAME is already set 2024-01-30 12:25:44 -05:00
Silvio Traversaro 06af18b9db cmake: Allow CMAKE_INSTALL_PREFIX to be set by environment variable 
Fixes: #25023
 2024-01-30 11:44:45 -05:00
Brad King 03206842ff Merge topic 'test-define-prop' 
6c3311d53b Help: Document property redefinition semantics
7aacae4e0e Tests: Add unit tests for property redefinition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9136
 2024-01-30 11:31:10 -05:00
Brad King c64c20e7e0 Merge topic 'FindICU-include-dir-advanced' 
005e50f5b0 FindICU: Mark ICU_INCLUDE_DIR as advanced variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9199
 2024-01-30 11:30:02 -05:00
Brad King 22a52526e2 Merge branch 'upstream-zlib' into update-zlib 
# By zlib upstream
* upstream-zlib:
  zlib 2022-10-12 (04f42cec)
 2024-01-30 10:15:31 -05:00
zlib upstream 6c2bed54f6 zlib 2022-10-12 (04f42cec) 
Code extracted from:

    https://github.com/madler/zlib.git

at commit 04f42ceca40f73e2978b50e93806c2a18c1281fc (v1.2.13).
 2024-01-30 10:15:30 -05:00
Brad King e868b19ed1 zlib: Fix 1.2.13 version and date notice 
Issue: #25576
 2024-01-30 10:14:46 -05:00