mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
61,591 Commits 2 Branches 401 Tags
41aa59376e1782c69b69ef864e223f1150280591
Commit Graph

61591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 41aa59376e Merge branch 'release-3.26' 2023-04-03 08:56:56 -04:00
Brad King 997e5fa714 Merge topic 'vs-fortran-try_compile' 
4da50fe3f4 VS: Remove extra try_compile argument in Intel Fortran check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8383
 2023-04-03 08:56:55 -04:00
Brad King 921ffd3070 Merge topic 'vs-fortran-try_compile' into release-3.26 
4da50fe3f4 VS: Remove extra try_compile argument in Intel Fortran check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8383
 2023-04-03 08:56:54 -04:00
Kitware Robot 02f23be9a7 CMake Nightly Date Stamp 2023-04-03 00:01:20 -04:00
Kitware Robot 17b8d01e22 CMake Nightly Date Stamp 2023-04-02 00:01:07 -04:00
Kitware Robot 063c07e097 CMake Nightly Date Stamp 2023-04-01 00:01:07 -04:00
Brad King 4da50fe3f4 VS: Remove extra try_compile argument in Intel Fortran check 
Refactoring in commit d00d8537f6 (Modules: Use new keyword-dispatched
try_compile signature, 2022-09-16, v3.25.0-rc1~115^2) accidentally
left one of the old signature arguments behind, causing a warning.
 2023-03-31 08:22:23 -04:00
Brad King 17e6b2bdca Merge topic 'automoc-cxx-standard' 
429a452705 Autogen: Add target's C++ standard to moc_predef.h
21f812e57c Autogen: Split creation and setup of custom targets into separate steps

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8359
 2023-03-31 08:09:06 -04:00
Brad King fb37de96a0 Merge topic 'remove-FindPythonInterp-FindPythonLibs' 
a4c5b91f80 FindPython{Interp,Libs}: Add policy to remove these modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !8380
 2023-03-31 08:08:18 -04:00
Brad King afaeee52a7 Merge topic 'ci-FindHDF5' 
75bb2a2ee4 Tests: Extend FindHDF5 tests to link and run executables
919de8785b ci: Patch HDF5 Fortran compiler wrappers in Fedora jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8381
 2023-03-31 08:06:37 -04:00
Brad King ae9f725b9b Merge topic 'cuda-arch-nvcc-options-file' 
6546da83b3 CUDA: Fix CUDA architecture flags for nvcc response files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !8379
 2023-03-31 08:05:10 -04:00
Brad King 61681128e1 Merge topic 'presets-add-trace' 
8e579b0228 presets: Add trace options to configure presets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8254
 2023-03-31 08:03:58 -04:00
Brad King 2159906731 Merge topic 'strip-macos' 
689616785f macOS: Do not pass Apple-specific flags to llvm-strip

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8374
 2023-03-31 08:02:20 -04:00
Brad King be3c564f8c Merge topic 'binutils-strip-macos' 
ac2562afb3 BinUtils: Avoid llvm-strip on Apple platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8372
 2023-03-31 08:01:16 -04:00
Kitware Robot f52a2fd26d CMake Nightly Date Stamp 2023-03-31 00:01:07 -04:00
Brad King 75bb2a2ee4 Tests: Extend FindHDF5 tests to link and run executables 
Verify that this works using both targets and variables.
 2023-03-30 15:05:59 -04:00
Brad King 919de8785b ci: Patch HDF5 Fortran compiler wrappers in Fedora jobs 
In Fedora's HDF5 packages for OpenMPI and MPICH, the `h5pfc` compiler
wrappers for Fortran use the wrong search path for their Fortran
modules.  Patch them locally in CI jobs until it is fixed in Fedora
upstream.
 2023-03-30 15:05:39 -04:00
Brad King a4c5b91f80 FindPython{Interp,Libs}: Add policy to remove these modules 
The `FindPythonInterp` and `FindPythonLibs` modules have been deprecated
since CMake 3.12.  Add a policy to pretend they do not exist in order to
encourage projects to port to `FindPython` or `FindPython{2,3}`.
 2023-03-30 12:05:09 -04:00
Brad King 6546da83b3 CUDA: Fix CUDA architecture flags for nvcc response files 
`nvcc --options-file` does not parse unquoted arguments in a response
file correctly if they contain `[]`.  Quote the `--generate-code=` flags
we add for CUDA architectures.

Fixes: #24657
 2023-03-30 09:43:01 -04:00
Artin Alavi 8e579b0228 presets: Add trace options to configure presets 
Add JSON schema version 7 to support them.

Fixes: #22543
 2023-03-30 09:18:53 -04:00
Brad King 4901fdb201 Merge topic 'presets-json-errors' 
19305afd8a presets: Improve JSON parser and error messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !8290
 2023-03-30 08:51:18 -04:00
Brad King 1d1ee2b049 Merge topic 'ci-FindHDF5' 
d38c752de2 ci: Enable FindHDF5 tests on Linux builds
28c4945a8a ci: Add HDF5 to Debian and Fedora base images
ad9e151045 Tests: Add cases covering FindHDF5 variables and imported targets
0e87e6c1a4 Tests: Add FindMPI test environment modification option
ee075a53c8 FindHDF5: Record compiler wrapper checks to configure log
72915b1068 FindHDF5: Fix compiler wrapper checks with spaces in path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8378
 2023-03-30 07:22:17 -04:00
Brad King a4e166fe7a Merge topic 'clang-tidy-module-gitignore' 
550f6b40bd clang-tidy module: copy .gitignore from top level

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8377
 2023-03-30 07:20:38 -04:00
Brad King 770f0ef7d6 Merge topic 'codespellrc-no-count' 
c7d978d371 ci: remove "count =" from .codespellrc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8376
 2023-03-30 07:19:56 -04:00
Brad King dfe32d797e Merge topic 'ninja-performance' 
426f3295f6 Ninja: Use more efficient data structures to collect outputs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8371
 2023-03-30 07:19:05 -04:00
Brad King ac2562afb3 BinUtils: Avoid llvm-strip on Apple platforms 
Since commit cf82300a63 (BinUtils: Clarify search logic and make it more
consistent, 2021-05-27, v3.21.0-rc1~119^2~2) we prefer `llvm-strip` over
`strip` when using Clang.  However, `llvm-strip` seems to produce
unusable binaries in cases involving chained fixups.  Prefer Apple's
`strip` over `llvm-strip` on `APPLE` platforms.

We still need to consider `llvm-strip` as a fallback as explained for
`llvm-ar` by commit fee36b7a78 (BinUtils: Restore llvm-ar fallback on
Apple platforms, 2022-03-15, v3.23.0-rc4~12^2).

Issue: #24601
 2023-03-30 07:14:07 -04:00
Brad King 2f3ba93102 Merge topic 'FindOpenAL-framework' 
f05bd762f5 ci: Enable FindOpenAL test on macOS jobs
1d06554fc6 Tests: Fix FindOpenAL test for macOS framework
5f5476ee31 FindOpenAL: Fix imported target for macOS framework

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8373
 2023-03-30 06:57:10 -04:00
Orkun Tokdemir 429a452705 Autogen: Add target's C++ standard to moc_predef.h 
Generate `moc_predef.h` using the same C++ standard level that will be
used to compile the target so that the compiler's predefined macros can
be more accurately recovered.

Fixes: #24624
Qt-Issue: https://bugreports.qt.io/browse/QTBUG-110847
 2023-03-30 06:41:51 -04:00
Kitware Robot cecdd470a9 CMake Nightly Date Stamp 2023-03-30 00:01:08 -04:00
Brad King d38c752de2 ci: Enable FindHDF5 tests on Linux builds 2023-03-29 17:18:30 -04:00
Brad King 28c4945a8a ci: Add HDF5 to Debian and Fedora base images 2023-03-29 17:18:30 -04:00
Brad King ad9e151045 Tests: Add cases covering FindHDF5 variables and imported targets 2023-03-29 17:18:30 -04:00
Brad King 0e87e6c1a4 Tests: Add FindMPI test environment modification option 
Provide a way to configure an environment specific to this test.
Avoid setting the environment globally for it in CI jobs.
 2023-03-29 17:18:30 -04:00
Brad King ee075a53c8 FindHDF5: Record compiler wrapper checks to configure log 2023-03-29 17:18:29 -04:00
Brad King 72915b1068 FindHDF5: Fix compiler wrapper checks with spaces in path 
Some HDF5 compiler wrappers do not support source file paths that
contain spaces.  Pass source files to them using a file name in the
current working directory to avoid spaces.
 2023-03-29 17:18:29 -04:00
Kyle Edwards 550f6b40bd clang-tidy module: copy .gitignore from top level 
Since 8b094845, .gitignore entries have been pinned to the top-level
.gitignore file. Copy these entries into a .gitignore for the
clang-tidy module.
 2023-03-29 16:32:40 -04:00
Kyle Edwards c7d978d371 ci: remove "count =" from .codespellrc 
Since 42445b2c, we've been printing a message for each invocation
of codespell. The count print is redundant and clutters the log.
 2023-03-29 15:20:54 -04:00
Brad King 689616785f macOS: Do not pass Apple-specific flags to llvm-strip 
Since commit cf82300a63 (BinUtils: Clarify search logic and make it more
consistent, 2021-05-27, v3.21.0-rc1~119^2~2) we prefer `llvm-strip` over
`strip` when using Clang.  However, since commit 20291e8e72 (install:
Fix stripping on macOS, 2019-01-30, v3.14.0-rc1~31^2) on macOS we add
flags `-u -r`, needed by Apple's `strip` for executables, but that
`llvm-strip` does not need or support.  Improve the condition to add
Apple-specific flags only when the selected `strip` tool is Apple's.

Note that Apple dylibs must be stripped with `-x` with either Apple's
`strip` or `llvm-strip`.

Fixes: #24601
 2023-03-29 15:19:47 -04:00
Brad King 63441bb920 Merge branch 'release-3.26' 2023-03-29 14:59:59 -04:00
Brad King bef6a27531 CMake 3.26.2 v3.26.2 2023-03-29 14:19:57 -04:00
nega f05bd762f5 ci: Enable FindOpenAL test on macOS jobs 2023-03-29 13:42:06 -04:00
nega 1d06554fc6 Tests: Fix FindOpenAL test for macOS framework 
- Use framework-style includes.
- Hush deprecation warnings when compiling test.
 2023-03-29 13:42:02 -04:00
nega 5f5476ee31 FindOpenAL: Fix imported target for macOS framework 
If a framework is found, specify it through `INTERFACE_LINK_LIBRARIES`
because `IMPORTED_LOCATION` requires a file and not a framework
directory.
 2023-03-29 13:31:48 -04:00
Martin Duffy 19305afd8a presets: Improve JSON parser and error messages 2023-03-29 10:41:19 -04:00
Brad King f3e348b62e Merge topic 'install-namelink-no-rpath' 
9c14f14848 install(TARGETS): Do not apply installation tweaks to NAMELINK files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8370
 2023-03-29 09:15:56 -04:00
Brad King 469506aee8 Merge topic 'doc-compile-options' 
e2830cf16b Help: Link to COMPILE_LANGUAGE genex from target_compile_options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8369
 2023-03-29 09:14:34 -04:00
Brad King b164772f13 Merge branch 'release-3.26' 2023-03-29 09:13:33 -04:00
Brad King d79237a580 Merge topic 'swift-old-driver' 
006e1995eb Swift: Restore compatibility with old C++ driver

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8365
 2023-03-29 09:13:33 -04:00
Brad King 0849598ff8 Merge topic 'swift-old-driver' into release-3.26 
006e1995eb Swift: Restore compatibility with old C++ driver

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8365
 2023-03-29 09:13:31 -04:00
Kitware Robot 79a8f6da5d CMake Nightly Date Stamp 2023-03-29 00:01:08 -04:00