mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 20:00:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
65,631 Commits 2 Branches 401 Tags
529ccb3dff96d18fc1a13ae7bc65eb82a18ff1e8
Commit Graph

11205 Commits

Author SHA1 Message Date
Brad King 83ceca6678 Merge topic 'ctest-resource-lock' 
85745cce7a ctest: Restore enforcement of RESOURCE_LOCK test property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9394
 2024-04-02 08:09:13 -04:00
Brad King 85745cce7a ctest: Restore enforcement of RESOURCE_LOCK test property 
Refactoring in commit 5ff0b4ed57 (cmCTestMultiProcessHandler:
Consolidate test readiness checks, 2023-10-20, v3.29.0-rc1~378^2~4)
accidentally broke `RESOURCE_LOCK`.  Fix it and replace the previous
test with one that would have caught this.

Fixes: #25843
 2024-04-01 12:22:29 -04:00
Brad King 252c2a6fcb Merge topic 'add_library-no-static-fallback' 
a61c9afdf8 add_library: Reject shared libraries on platforms that do not support them

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9347
 2024-04-01 09:38:14 -04:00
Brad King 554a9b00c8 Merge topic 'tls-verify' 
7139944264 ctest: Fall back to CMake environment variable for TLS server verification
c295df53c6 ctest: Test fallback to CMake options for TLS server verification
0d250dd021 ExternalProject: Honor CMAKE_TLS_VERIFY environment variable
e8404502b1 ExternalProject: Revise TLS_VERIFY wording to use TLS_VERSION pattern
46faaf9667 file(DOWNLOAD|UPLOAD): Add CMAKE_TLS_VERIFY environment variable
8b0169fe2b file(DOWNLOAD|UPLOAD): Add test covering CMAKE_TLS_VERIFY cmake variable
93886f5c7d file(DOWNLOAD|UPLOAD): Avoid unnecessary CMAKE_TLS_VERIFY variable lookup
bed32f400e file(DOWNLOAD|UPLOAD): Document TLS_VERSION fallback to environment variable
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9389
 2024-04-01 09:37:20 -04:00
Brad King ae41bfc6c2 Merge topic 'nested-package-config-file' 
6ddf8712cd CMakePackageConfigHelpers: Use unique variable name for pkg prefix
91b9d35608 CMakePackageConfigHelpers: Remove unused variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9390
 2024-04-01 09:35:09 -04:00
Craig Scott 6ddf8712cd CMakePackageConfigHelpers: Use unique variable name for pkg prefix 
Fixes: #25827
 2024-04-01 09:32:37 +11:00
Brad King 7139944264 ctest: Fall back to CMake environment variable for TLS server verification 
Use `ENV{CMAKE_TLS_VERIFY}` if `CTEST_TLS_VERIFY` or `CMAKE_TLS_VERIFY`
is not set.

Issue: #23608
 2024-03-30 09:22:05 -04:00
Brad King c295df53c6 ctest: Test fallback to CMake options for TLS server verification 2024-03-30 09:22:05 -04:00
Brad King 46faaf9667 file(DOWNLOAD|UPLOAD): Add CMAKE_TLS_VERIFY environment variable 
Issue: #23608
 2024-03-30 09:22:04 -04:00
Brad King 8b0169fe2b file(DOWNLOAD|UPLOAD): Add test covering CMAKE_TLS_VERIFY cmake variable 2024-03-30 09:22:04 -04:00
Brad King 6c44abb6e0 Tests: Update cmake_minimum_required version in RunCMake ctest cases 
This was missed in commit 1edf138506 (Tests/RunCMake: Update
cmake_minimum_required versions, 2023-02-06, v3.27.0-rc1~508^2~1).
 2024-03-29 14:17:58 -04:00
Asit Dhal a61c9afdf8 add_library: Reject shared libraries on platforms that do not support them 
Add policy CMP0164 to provide compatibility.

Fixes: #25759
 2024-03-29 11:06:32 -04:00
Brad King f852f33c69 Merge topic 'prop-GENERATED-visibility' 
071f0d6f98 CMP0163: Make GENERATED source file property globally visible
00c6573d86 cmSetPropertyCommand: Refactor checks for CMP0118
e04af1e9c2 cmGetSorceFilePropertyCommand: Simplify string comparisons

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9308
 2024-03-29 09:59:06 -04:00
Deniz Bahadir 071f0d6f98 CMP0163: Make GENERATED source file property globally visible 
This was originally attempted by policy CMP0118, but its
implementation did not cover all intended use cases.  We fixed its
documentation in commit 1dabbbb5e0 (CMP0118: Revise documentation to
describe actual behavior, 2024-03-20).

Add new policy CMP0163 to cover the remaining use cases.  In particular,
make the `GENERATED` property visible to `get_property` calls in other
directories.  In order to capture the original intention of CMP0118,
define CMP0163's NEW behavior to also imply CMP0118's NEW behavior.

Fixes: #25437
Fixes: #25058
 2024-03-29 08:54:11 -04:00
Brad King 03884f4f32 CPack/WIX: Add support for WiX Toolset v4 
Add a `CPACK_WIX_VERSION` option to specify version WiX for
which the project is configured.

Fixes: #23910
 2024-03-24 15:26:39 -04:00
Brad King e7f5ad8df2 Tests: Prepare RunCMake.CPack_WIX to cover multiple WiX versions 2024-03-24 14:43:11 -04:00
Brad King 7c326643ad Merge topic 'file-RPATH-large-ELF' 
615a1c6691 cmELF: Get correct section count for large ELF binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9310
 2024-03-24 14:34:23 -04:00
Brad King 899af83755 Merge topic 'linker-vars-propagate-try_compile' 
98cc86e265 try_compile(): Include languages with _ or - when passing linker vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9361
 2024-03-24 14:33:31 -04:00
Martin Duffy 615a1c6691 cmELF: Get correct section count for large ELF binaries 
Fixes: #24877
 2024-03-22 10:18:06 -04:00
Brad King cff8aefc6a Merge topic 'doc-CMP0118' 
1dabbbb5e0 CMP0118: Revise documentation to describe actual behavior
d2f5b79795 CMP0118: Fix some tests and add more tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9358
 2024-03-22 09:34:31 -04:00
Craig Scott 98cc86e265 try_compile(): Include languages with _ or - when passing linker vars 
Fixes: #25809
 2024-03-22 21:35:51 +11:00
Deniz Bahadir 1dabbbb5e0 CMP0118: Revise documentation to describe actual behavior 
The policy was originally intended to make the `GENERATED` source file
property globally visible, but the implementation didn't fully achieve
that goal.  Revise the documentation to describe what it actually does.

Issue: #25437
 2024-03-21 11:37:46 -04:00
Brad King 388f7bc11b Merge topic 'fileapi-provide-glob-dependent' 
6116bcb066 fileapi: Add CONFIGURE_DEPENDS glob info to cmakeFiles object
f578515d02 cmGlobCacheEntry: Add helper to carry CONFIGURE_DEPENDS glob cache arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9348
 2024-03-21 09:29:00 -04:00
Brad King d704a3f818 Merge topic 'ninja-fortran-include' 
36dc8d6d50 Ninja: Fix Fortran module deps in files INCLUDEd by preprocessed sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9351
 2024-03-20 09:55:48 -04:00
Brad King 0287208bbf Merge topic 'ninja-fortran-include' into release-3.29 
36dc8d6d50 Ninja: Fix Fortran module deps in files INCLUDEd by preprocessed sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9351
 2024-03-20 09:55:47 -04:00
Brad King 9ef00786b2 Merge topic 'package-dispatch-apple' 
85d6d3b2e3 generate_apple_*_selection_file: Add option to capture errors
2149dbd379 generate_apple_architecture_selection_file: Document $(ARCHS_STANDARD) support
be642f6ed5 generate_apple_architecture_selection_file: Simplify signature
8959ad9db1 Tests/RunCMake/CMakePackage: Fix Apple architecture selection argument order
677f3d721b Tests/RunCMake/CMakePackage: Add architecture i386 for macOS on Xcode < 10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9349
 2024-03-20 09:51:45 -04:00
Brad King eb403bb7b4 Tests: Pass path to WiX 3 into RunCMake.CPack_WIX test 
Avoid requiring its location to be in the PATH environment variable.
 2024-03-19 19:46:07 -04:00
Deniz Bahadir d2f5b79795 CMP0118: Fix some tests and add more tests 2024-03-20 00:42:16 +01:00
Arctic Lampyrid 6116bcb066 fileapi: Add CONFIGURE_DEPENDS glob info to cmakeFiles object 
Fixes: #25668
Co-authored-by: Brad King <brad.king@kitware.com>
 2024-03-19 14:55:25 -04:00
Brad King 85d6d3b2e3 generate_apple_*_selection_file: Add option to capture errors 
Add an option to capture error messages in a variable instead of
terminating with a fatal error.

Fixes: #25778
 2024-03-19 09:52:32 -04:00
Brad King 2149dbd379 generate_apple_architecture_selection_file: Document $(ARCHS_STANDARD) support 
Also add a test case.

Fixes: #25780
 2024-03-19 09:52:32 -04:00
Brad King be642f6ed5 generate_apple_architecture_selection_file: Simplify signature 
Allow callers to pass multiple values to list-valued arguments
instead of putting the entire list in a single quoted argument.

Fixes: #25779
 2024-03-19 09:52:32 -04:00
Brad King 8959ad9db1 Tests/RunCMake/CMakePackage: Fix Apple architecture selection argument order 
Call `generate_apple_architecture_selection_file` with matching order in
`SINGLE_ARCHITECTURES` and `SINGLE_ARCHITECTURE_INCLUDE_FILES`.
 2024-03-19 09:51:21 -04:00
Brad King 677f3d721b Tests/RunCMake/CMakePackage: Add architecture i386 for macOS on Xcode < 10 
Use every architecture each version of Xcode has in `$(ARCHS_STANDARD)`.
 2024-03-19 09:46:57 -04:00
Brad King 36dc8d6d50 Ninja: Fix Fortran module deps in files INCLUDEd by preprocessed sources 
If a preprocessed source also uses the Fortran `INCLUDE` directive,
search the original source file's directory.

Fixes: #25792
 2024-03-19 07:56:13 -04:00
Brad King 406e207e74 Tests: Teach RunCMake.CPack_WIX to honor windows-arm64 hosts 2024-03-18 15:12:02 -04:00
Brad King 9c472b9482 Tests: Convert CPackWiXGenerator to RunCMake.CPack_WIX 2024-03-18 15:11:49 -04:00
Brad King 0b3756a7e3 Tests/RunCMake: Add new infrastructure to run cpack 
Create an alternative to the `Tests/RunCMake/CPack` infrastructure
that more closely follows the rest of RunCMake's conventions.
 2024-03-18 14:04:17 -04:00
Brad King 7cc09d8859 Tests/RunCMake: Add option to print custom details in failure output 2024-03-18 14:04:17 -04:00
Brad King fce0617408 Merge topic 'ci-wix' 
cb1b2dc664 ci: Provide WiX 3 in PATH of jobs that need it
b71b6300e5 ci: Provide WiX 3 in versioned location
694f14f96f Tests: Teach CPackWiXGenerator to use WiX tools in PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9342
 2024-03-18 14:01:26 -04:00
Brad King 399f37894c Merge topic 'Apple-TBD-in-subdirecory' 
bcc26ce465 Apple Text Based Stubs: should be usage in subdirectories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9341
 2024-03-14 13:31:12 -04:00
Brad King e497fbfca3 Merge topic 'Apple-TBD-in-subdirecory' into release-3.29 
bcc26ce465 Apple Text Based Stubs: should be usage in subdirectories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9341
 2024-03-14 13:31:10 -04:00
Brad King 694f14f96f Tests: Teach CPackWiXGenerator to use WiX tools in PATH 2024-03-14 11:51:03 -04:00
Brad King 2bfaaf6f6e Merge topic 'autogen-makefile-depfile' 
d2d1763f88 cmQtAutoGenInitializer: De-duplicate autogen/timestamp target depend logic
6193d15556 Autogen: Restore target-ordering dependencies in Makefiles with DEPFILE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9340
 2024-03-14 11:46:54 -04:00
Brad King 742af6cff7 Merge topic 'autogen-makefile-depfile' into release-3.29 
d2d1763f88 cmQtAutoGenInitializer: De-duplicate autogen/timestamp target depend logic
6193d15556 Autogen: Restore target-ordering dependencies in Makefiles with DEPFILE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9340
 2024-03-14 11:46:53 -04:00
Brad King 8526943b8c Merge topic 'LINKER_TYPE-mold-support' 
801ae06952 LINKER_TYPE: Support MOLD only on GCC versions that support it
939ac5287e LINKER_TYPE: fix spelling error in message
922883782b LINKER_TYPE: Document that linker tool should be in the PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9334
 2024-03-14 11:45:14 -04:00
Brad King 8f0801cacc Merge topic 'LINKER_TYPE-mold-support' into release-3.29 
801ae06952 LINKER_TYPE: Support MOLD only on GCC versions that support it
939ac5287e LINKER_TYPE: fix spelling error in message
922883782b LINKER_TYPE: Document that linker tool should be in the PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9334
 2024-03-14 11:45:13 -04:00
Marc Chevrier bcc26ce465 Apple Text Based Stubs: should be usage in subdirectories 
Fixes: #25765
 2024-03-14 14:33:48 +01:00
Brad King 6193d15556 Autogen: Restore target-ordering dependencies in Makefiles with DEPFILE 
In commit aebfbcaa46 (AutoGen: Use depfiles for the XXX_autogen ninja
targets, 2020-01-14, v3.17.0-rc1~58^2) the `_autogen_timestamp_deps`
target was given target ordering dependencies through its custom command
rather than direct target dependencies as on the `_autogen` target.
Then commit 895fa3433f (cmQtAutoGenInitializer: support IMPLIB-only
imported targets, 2021-09-23, v3.22.0-rc1~80^2) converted some
target-level dependencies into file-level dependencies on the custom
command.  This only works with a monolithic build graph like Ninja.

Since commit ebc9e448b3 (Autogen: Add depfile support for Makefiles,
2023-09-07, v3.28.0-rc1~101^2~1) we use the `_autogen_timestamp_deps`
target in Makefile generators too.  This exposed the missing target
ordering dependency.

Fixes: #25766
 2024-03-14 09:05:06 -04:00
Marc Chevrier 801ae06952 LINKER_TYPE: Support MOLD only on GCC versions that support it 
Fixes: #25748
 2024-03-13 11:13:21 -04:00