mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-28 09:58:53 -06:00
Code Issues Packages Projects Releases Wiki Activity
64,673 Commits 2 Branches 390 Tags
3ed275bbb61167d07f6ee2d6cbbcf61cd4d1fca0
Commit Graph

64673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
3ed275bbb6 CPack/WiX: Fix installer status text 
Previously, installers displayed extra text on some Windows versions:

    File: [1], Directory: [9], Size [6]

Add an option to our WiX templates to suppress that.

Fixes: #25634
 2024-01-24 15:28:13 -05:00
Brad King
ad50700038 Merge topic 'cpack-rpm-threads' 
453742ae88 CPack/RPM: Enable rpm threads during package generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9178
 2024-01-24 08:39:54 -05:00
Brad King
73b76563fb Merge topic 'validate_read-only_target_properties' 
0cfd8fe8ad cmTarget: Don't allow setting read-only properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9133
 2024-01-24 08:39:09 -05:00
Kitware Robot
31cdde5ce8 CMake Nightly Date Stamp 2024-01-24 00:01:18 -05:00
Brad King
0a7e4a06cc Merge branch 'release-3.28' 2024-01-23 14:57:08 -05:00
Brad King
e855c7a4de Merge topic 'FindMatlab-docs' 
b8665d44ba FindMatlab: Fix error message from function
44d2cf3ed4 FindMatlab: Document all registry paths for version lookup
363a7d4693 FindMatlab: matlab_get_release_name_from_version is a function now

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9175
 2024-01-23 14:57:08 -05:00
Brad King
30c067e24a Merge topic 'FindMatlab-docs' into release-3.28 
b8665d44ba FindMatlab: Fix error message from function
44d2cf3ed4 FindMatlab: Document all registry paths for version lookup
363a7d4693 FindMatlab: matlab_get_release_name_from_version is a function now

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9175
 2024-01-23 14:57:07 -05:00
Brad King
4571ce5f1a Merge topic 'cuda-clang-windows' 
88c740462c CUDA/Clang: Add support for MSVC ABI on Windows using GNU-like frontend

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !9172
 2024-01-23 14:56:16 -05:00
Elijah Zarezky
453742ae88 CPack/RPM: Enable rpm threads during package generation 
Previously, `w7.xzdio` only used a single CPU core.
Honor `CPACK_THREADS`: `w7T${CPACK_THREADS}.xzdio` uses the specified
number of threads. `w7T.xzdio` uses all available CPU cores.

Fixes: #25615
 2024-01-23 12:10:35 -05:00
Robert Maynard
0cfd8fe8ad cmTarget: Don't allow setting read-only properties 
Ensure that all documented read-only target properties now produce
errors when trying to set.
 2024-01-23 08:50:38 -05:00
Kitware Robot
77dc558d1e CMake Nightly Date Stamp 2024-01-23 00:01:12 -05:00
Brad King
88c740462c CUDA/Clang: Add support for MSVC ABI on Windows using GNU-like frontend 
Fixes: #20776
 2024-01-22 09:33:54 -05:00
Hermann von Kleist
b8665d44ba FindMatlab: Fix error message from function 2024-01-22 09:29:57 -05:00
Hermann von Kleist
44d2cf3ed4 FindMatlab: Document all registry paths for version lookup 2024-01-22 09:29:09 -05:00
Hermann von Kleist
363a7d4693 FindMatlab: matlab_get_release_name_from_version is a function now 2024-01-22 09:28:04 -05:00
Brad King
5d1e689e68 Merge topic 'find_library-msvc-libfoo.a' 
c6efbd78d8 MSVC: Teach find_library to consider the 'libfoo.a' naming convention

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9173
 2024-01-22 09:19:09 -05:00
Brad King
5f415b9b15 Merge topic 'FindMPI.IntelLLVM' 
5e700411d2 FindMPI: add IntelLLVM MPI wrappers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9170
 2024-01-22 09:18:28 -05:00
Kitware Robot
71d1322d27 CMake Nightly Date Stamp 2024-01-22 00:01:18 -05:00
Kitware Robot
492d90380e CMake Nightly Date Stamp 2024-01-21 00:01:06 -05:00
Kitware Robot
c0247376c6 CMake Nightly Date Stamp 2024-01-20 00:01:07 -05:00
Brad King
c6efbd78d8 MSVC: Teach find_library to consider the 'libfoo.a' naming convention 
When targeting the GNU ABI, we consider `.a` libraries first but also
accept `.lib`.  For symmetry, when targeting the MSVC ABI, we now
consider `.lib` first but also accept `.a`.

This adds support for meson-generated static libraries, which are named
with the pattern `lib${foo}.a`:

* https://mesonbuild.com/FAQ.html#why-does-building-my-project-with-msvc-output-static-libraries-called-libfooa

Note that this was previously attempted by

* commit be848a71b0 (MSVC: Teach find_library to consider the 'libfoo.a'
                     naming convention, 2022-09-19, v3.25.0-rc1~111^2)

but was reverted by

* commit 955d6245c1 (MSVC: Revert "Teach find_library to consider the
                     'libfoo.a' naming convention", 2022-11-28, v3.25.1~6^2)

due to problems finding GNU ABI libraries in PATH-derived prefixes.
Since then,

* commit 0a81110b84 (find_(library|file|path): Drop PATH-derived search
                     prefixes, 2023-09-14, v3.28.0-rc1~91^2)

removed the problematic search paths, so we can restore this change.

Fixes: #23975
 2024-01-19 17:12:36 -05:00
Eisuke Kawashima
5e700411d2 FindMPI: add IntelLLVM MPI wrappers 
The Intel MPI library now provides `mpiicx`, `mpiicpx`, and `mpiifx`
wrappers, which respectively use `icx`, `icpx`, and `ifx` by default.
 2024-01-19 15:30:10 -05:00
Brad King
62ca95518e Merge topic 'cuda-test-cleanup' 
607d271b1f Tests: Do not expect nvToolsExt in CUDA 12 toolkit
5eb26fb943 Tests: Fix CudaOnly.Toolkit coverage of npp libs
af85fa7ac1 Tests: Remove unused dllexport markup from CudaOnly.DeviceLTO
d40bca5a8c Tests: Remove unused iostream from CUDA sources
a9bb2606c1 Tests: Fix condition adding nvcc-only flags in CudaOnly.SeparateCompilation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !9167
 2024-01-19 11:42:49 -05:00
Brad King
af076796c3 Merge topic 'cuda-clang-no-link-arch' 
45d53bdb70 CUDA/Clang: Do not pass explicit architecture flags when linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !9165
 2024-01-19 11:40:38 -05:00
Brad King
7f42261d31 Merge topic 'doc-par' 
434bd9c0ef Help: Document {CTEST,CMAKE_BUILD}_PARALLEL_LEVEL equivalent command-line

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9168
 2024-01-19 11:04:02 -05:00
Brad King
d5cc1da1ca Merge topic 'matlab-env' 
6f7d87b40d FindMatlab: use NAMES for find_*
9e97893147 FindMatlab: set MATLAB_ARCH per process call

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9161
 2024-01-19 11:02:56 -05:00
Brad King
842f12a055 Merge branch 'release-3.28' 2024-01-19 10:56:09 -05:00
Brad King
f7139c3e4a Merge topic 'cuda-clang' 
6251edc5a4 CUDA/Clang: Record architectures supported by Clang 16
07b7d0ceaa CUDA/Clang: Update architectures supported by CUDA 12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !9164
 2024-01-19 10:56:08 -05:00
Brad King
663bc936e8 Merge topic 'cuda-clang' into release-3.28 
6251edc5a4 CUDA/Clang: Record architectures supported by Clang 16
07b7d0ceaa CUDA/Clang: Update architectures supported by CUDA 12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !9164
 2024-01-19 10:56:07 -05:00
Brad King
eafd1015a5 Merge branch 'release-3.28' 2024-01-19 10:54:20 -05:00
Brad King
0102b25cf8 Merge topic 'cxxmodules-export-file-collisions' 
4cd153afe3 Merge branch 'backport-cxxmodules-export-file-collisions'
d791f3a180 cxxmodules: make export trampoline script files unique
2352dcc830 Source: Simplify hasher object construction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9166
 2024-01-19 10:54:20 -05:00
Brad King
10021726ad Merge topic 'cxxmodules-export-file-collisions' into release-3.28 
d791f3a180 cxxmodules: make export trampoline script files unique
2352dcc830 Source: Simplify hasher object construction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9166
 2024-01-19 10:54:19 -05:00
Kitware Robot
d07aee97fe CMake Nightly Date Stamp 2024-01-19 00:01:11 -05:00
Brad King
4cd153afe3 Merge branch 'backport-cxxmodules-export-file-collisions' 2024-01-18 17:45:07 -05:00
Ben Boeckel
d791f3a180 cxxmodules: make export trampoline script files unique 
Include the name of the `EXPORT` in the filename when generating export
information for C++ modules. This allows the same directory to be used
for multiple sets of C++ module-using targets.

For `export(TARGETS)` uses, generate a name based on the hash of the
concatenation of the target names involved with the `export()` call.

Fixes: #25609
 2024-01-18 17:40:44 -05:00
Brad King
2352dcc830 Source: Simplify hasher object construction 2024-01-18 17:40:32 -05:00
scivision
434bd9c0ef Help: Document {CTEST,CMAKE_BUILD}_PARALLEL_LEVEL equivalent command-line 
Clarify that the `--parallel` option isn't needed when these env.
variables are set to a finite integer.
 2024-01-18 17:37:17 -05:00
Brad King
607d271b1f Tests: Do not expect nvToolsExt in CUDA 12 toolkit 2024-01-18 14:27:29 -05:00
Brad King
5eb26fb943 Tests: Fix CudaOnly.Toolkit coverage of npp libs 2024-01-18 14:27:29 -05:00
Brad King
af85fa7ac1 Tests: Remove unused dllexport markup from CudaOnly.DeviceLTO 
The test does not use shared libraries.
 2024-01-18 14:27:29 -05:00
Brad King
d40bca5a8c Tests: Remove unused iostream from CUDA sources 2024-01-18 14:27:29 -05:00
Brad King
a9bb2606c1 Tests: Fix condition adding nvcc-only flags in CudaOnly.SeparateCompilation 2024-01-18 14:27:29 -05:00
Brad King
45d53bdb70 CUDA/Clang: Do not pass explicit architecture flags when linking 
Clang does not use architecture flags while driving the linker:

    warning: argument unused during compilation: '--cuda-gpu-arch=...'
 2024-01-18 13:23:42 -05:00
Brad King
6251edc5a4 CUDA/Clang: Record architectures supported by Clang 16 2024-01-18 12:28:14 -05:00
Brad King
07b7d0ceaa CUDA/Clang: Update architectures supported by CUDA 12 
In commit 4d90f65b24 (CUDA: Update set of architectures supported by
CUDA 12, 2022-12-19, v3.26.0-rc1~120^2) we incorrectly guarded dropping
removed architectures by compiler id, but it is actually the CUDA 12
toolkit itself that removed support.
 2024-01-18 12:27:53 -05:00
Brad King
c75047709f Merge topic 'autogen-exe-per-config' 
596e84b0d5 NinjaMultiConfig: Update tests for the new dependency change
7c39dabdbc Autogen: AUTO*_EXECUTABLE: add support for per-config values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8919
 2024-01-18 09:01:17 -05:00
Brad King
d3adede1cd Merge topic 'fix_CTestUpdateGIT' 
9ab1241035 Tests: Improve CTest.UpdateGIT robustness to user gitconfig

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9160
 2024-01-18 08:57:07 -05:00
Brad King
2bb5ad396b Merge topic 'FindPackageMessage-strip-spaces' 
4ecfd1a7dc FindPackageMessage: Remove extra whitespace from messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9156
 2024-01-18 08:56:22 -05:00
Brad King
2debd9dd4e Merge topic 'isspace' 
d9d9326e14 Source: Avoid out-of-range inputs to std::isspace()
14abdc8e2b cmXMLParser: Remove unused IsSpace method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9162
 2024-01-18 08:54:25 -05:00
Brad King
f3032be9fc Merge branch 'release-3.28' 2024-01-18 08:53:12 -05:00