mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-25 10:18:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
65,509 Commits 2 Branches 391 Tags
c8e2694679c2be02bbd3d8dbb98278b2ee977147
Commit Graph

65509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
c8e2694679 ci: Add script to repackage WiX .NET tool for our needs 
WiX Toolset 4+ is provided only via nuget packages.  Add a script to
repackage the parts we need for CMake's own testing and packaging.
 2024-03-24 15:26:31 -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
729d904050 Merge topic 'cpack-wix' 
d15c910a45 CPack/WIX: Remove "candle" from tool-agnostic error message
ac25c645a7 CPack/WIX: Improve formatting of CPACK_WIX_CUSTOM_XMLNS expansion
54d09a2b3f CPack/WIX: Document WiX Toolset v3 tools
d2f4836f8e CPack/WIX: Prepare to provide version-specific WiX templates
438809d3ba cmCPackGenerator: Add option to FindTemplate to use alternate builtin path
4d661e3a92 cmMakefile: Reduce GetModulesFile caller allocations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9363
 2024-03-24 14:35:14 -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
7f7105aa2c Merge branch 'release-3.29' 2024-03-24 14:33:31 -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
Brad King
78e89edab4 Merge topic 'linker-vars-propagate-try_compile' into release-3.29 
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:30 -04:00
Craig Scott
dbe05e4d7c Merge topic 'doc-tool' 
be6763f34b Help: cmake(1) --toolchain path relative

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9364
 2024-03-24 07:14:55 -04:00
Kitware Robot
6cddfdf974 CMake Nightly Date Stamp 2024-03-24 00:01:12 -04:00
Kitware Robot
86b55fd236 CMake Nightly Date Stamp 2024-03-23 00:01:13 -04:00
scivision
be6763f34b Help: cmake(1) --toolchain path relative 
other cmake(1) options are relative to cwd. It is surprising
enough that --toolchain is relative to -B or -S that it's
good to call it out here too.
 2024-03-22 17:17: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
d15c910a45 CPack/WIX: Remove "candle" from tool-agnostic error message 2024-03-22 09:58:42 -04:00
Brad King
ac25c645a7 CPack/WIX: Improve formatting of CPACK_WIX_CUSTOM_XMLNS expansion 2024-03-22 09:58:42 -04:00
Brad King
54d09a2b3f CPack/WIX: Document WiX Toolset v3 tools 
Add a dedicated section describing the `candle` and `light` tools.
Also improve formatting of some variables' documentation.
 2024-03-22 09:58:37 -04:00
Brad King
d2f4836f8e CPack/WIX: Prepare to provide version-specific WiX templates 
Move our template for WiX Toolset v3 to a versioned location.
 2024-03-22 09:51:06 -04:00
Brad King
438809d3ba cmCPackGenerator: Add option to FindTemplate to use alternate builtin path 2024-03-22 09:51:06 -04:00
Brad King
4d661e3a92 cmMakefile: Reduce GetModulesFile caller allocations 2024-03-22 09:51: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
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
Craig Scott
98cc86e265 try_compile(): Include languages with _ or - when passing linker vars 
Fixes: #25809
 2024-03-22 21:35:51 +11: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