mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-03 05:08:47 -06:00
Code Issues Packages Projects Releases Wiki Activity
65,490 Commits 2 Branches 391 Tags
cff8aefc6aa5fcf5c659b2c40027c86618426005
Commit Graph

65490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brad King
5b2e785431 Merge topic 'FindPython_MKL_Workaround' 
df551ee538 FindPython: fix NumPy detection when Intel MKL library is installed

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9359
 2024-03-22 09:14:39 -04:00
Brad King
976c241845 Merge branch 'release-3.29' 2024-03-22 09:01:54 -04:00
Brad King
0f141fbd68 Merge topic 'matlab-2024a' 
bade9832e6 FindMatlab: R2024a version map

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9360
 2024-03-22 09:01:54 -04:00
Brad King
0ebe55ae41 Merge topic 'matlab-2024a' into release-3.29 
bade9832e6 FindMatlab: R2024a version map

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9360
 2024-03-22 09:01:53 -04:00
Kitware Robot
b5926d01ba CMake Nightly Date Stamp 2024-03-22 00:01:12 -04: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
Even Rouault
df551ee538 FindPython: fix NumPy detection when Intel MKL library is installed 
In an environment where both NumPy and a recent Intel MKL library are
installed, the detection of numpy include directory fails because a
'import numpy' outputs a MKL related warning message on stdout...
(namely "Intel MKL WARNING: Support of Intel(R) Advanced Vector
Extensions (Intel(R) AVX) enabled only processors has been deprecated.
Intel oneAPI Math Kernel Library will use Intel(R) Streaming SIMD
Extensions 4.2 (Intel(R) SSE4.2) instructions instead.")

I've successfully tested the workaround mentioned at
https://github.com/numpy/numpy/issues/23775#issuecomment-1923327310
which consists in setting the MKL_ENABLE_INSTRUCTIONS=SSE4_2 environment
before importing numpy, hence this proposed workaround.
 2024-03-21 16:07:49 +01:00
scivision
bade9832e6 FindMatlab: R2024a version map 2024-03-21 10:13:59 -04:00
Brad King
df8057645e Merge branch 'release-3.29' 2024-03-21 10:07:54 -04:00
Brad King
25d2850c19 CMake 3.29.0 v3.29.0 2024-03-21 09:32:22 -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
1485b65b0d Merge topic 'FindSWIG-enhance-lookup-strategy' 
8ff66a766f FindSWIG: Enhance lookup capabilities using VALIDATOR argument
ef51650558 FindSWIG: Search now all artifacts per directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9357
 2024-03-21 09:28:12 -04:00
Brad King
aa8fec906f Merge topic 'check-strict-prototypes' 
1a4610269a Modules: Fix checks under -Werror=strict-prototypes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9344
 2024-03-21 09:27:09 -04:00
Kitware Robot
1923a13e4c CMake Nightly Date Stamp 2024-03-21 00:01:12 -04:00
Brad King
9ac78c777f Merge branch 'release-3.29' 2024-03-20 10:36:07 -04:00
Brad King
f31523c251 Merge branch 'release-3.28' 2024-03-20 10:35:51 -04:00
Brad King
7e52f9d4e0 Merge branch 'release-3.28' into release-3.29 2024-03-20 10:35:33 -04:00
Marc Chevrier
8ff66a766f FindSWIG: Enhance lookup capabilities using VALIDATOR argument 
Currently, swig executable naming strategy is a bit odd: For example swig4.0 executable
can have version 4.2.0!i Moreover, not all platforms provide a versioned executable.

So, to pick-up the right executable when multiple versions are available,
use find_program(... VALIDATOR ...).
 2024-03-20 15:22:40 +01:00
Marc Chevrier
ef51650558 FindSWIG: Search now all artifacts per directory 
Fixes: #25566
 2024-03-20 15:22:40 +01:00
Brad King
b5602e7254 CMake 3.28.4 v3.28.4 2024-03-20 10:03:43 -04:00
Brad King
48f1f3c8dc Merge branch 'release-3.29' 2024-03-20 09:57:37 -04:00
Brad King
61299239a3 Merge branch 'release-3.28' 2024-03-20 09:57:30 -04:00
Brad King
780c1ab0ec Merge branch 'release-3.28' into release-3.29 2024-03-20 09:56:40 -04:00
Brad King
a53d19485b Merge branch 'release-3.29' 2024-03-20 09:55:48 -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
5969b4f457 Merge topic 'ninja-fortran-include' into release-3.28 
36dc8d6d50 Ninja: Fix Fortran module deps in files INCLUDEd by preprocessed sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9351
 2024-03-20 09:54:50 -04:00
Brad King
94edef2471 Merge branch 'release-3.29' 2024-03-20 09:51:45 -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
3135a99467 Merge topic 'package-dispatch-apple' into release-3.29 
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:43 -04:00
Brad King
d8755080df Merge topic 'ci-wix' 
eb403bb7b4 Tests: Pass path to WiX 3 into RunCMake.CPack_WIX test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9356
 2024-03-20 09:49:31 -04:00
Brad King
76cdb9e047 Merge topic 'warning-suppressions' 
6c57a48c24 CTestCustom: Ignore warnings about curl and expat objects with no symbols

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9354
 2024-03-20 09:41:03 -04:00
Peter Kokot
1a4610269a Modules: Fix checks under -Werror=strict-prototypes 
This fixes configuration checks when using -Werror=strict-prototypes or
-Wstrict-prototypes compiler flag, for example, via the CMAKE_C_FLAGS.
 2024-03-20 12:42:48 +01:00
Kitware Robot
a17d76f291 CMake Nightly Date Stamp 2024-03-20 00:01:18 -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
Arctic Lampyrid
f578515d02 cmGlobCacheEntry: Add helper to carry CONFIGURE_DEPENDS glob cache arguments 2024-03-20 02:30:53 +08:00
Brad King
69a2eeb9df Merge branch 'release-3.29' 2024-03-19 10:10:16 -04:00
Brad King
aa643b66a8 Merge topic 'doc-release-3.29-typos' 
eceb368ccc Help: Fix typos in 3.29 docs
31fb693d06 Help: Fix typos and grammar in pre-3.29 docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9353
 2024-03-19 10:10:16 -04:00
Brad King
b877fb49ce Merge topic 'doc-release-3.29-typos' into release-3.29 
eceb368ccc Help: Fix typos in 3.29 docs
31fb693d06 Help: Fix typos and grammar in pre-3.29 docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9353
 2024-03-19 10:10:15 -04:00
Brad King
4cb8f1de47 Merge branch 'release-3.29' 2024-03-19 10:09:20 -04:00
Brad King
6b035118de Merge topic 'doc-exit-code-range' 
c980745b82 Help: Specify advisable range for exit code in cmake_language(EXIT)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9352
 2024-03-19 10:09:20 -04:00
Brad King
88d2dd0735 Merge topic 'doc-exit-code-range' into release-3.29 
c980745b82 Help: Specify advisable range for exit code in cmake_language(EXIT)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9352
 2024-03-19 10:09:19 -04:00
Brad King
ff7ccc086e Merge topic 'ci-wix' 
406e207e74 Tests: Teach RunCMake.CPack_WIX to honor windows-arm64 hosts
9c472b9482 Tests: Convert CPackWiXGenerator to RunCMake.CPack_WIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9350
 2024-03-19 10:06:43 -04:00
Brad King
1b3931071b Merge topic 'test-RunCPack' 
0b3756a7e3 Tests/RunCMake: Add new infrastructure to run cpack
7cc09d8859 Tests/RunCMake: Add option to print custom details in failure output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9355
 2024-03-19 10:05:46 -04:00
Brad King
6c57a48c24 CTestCustom: Ignore warnings about curl and expat objects with no symbols 2024-03-19 09:57:21 -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