mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-13 18:00:09 -06:00
Code Issues Packages Projects Releases Wiki Activity
62,631 Commits 2 Branches 385 Tags
e48dbbf048604397ec00a2f95600e57b57634577
Commit Graph

4851 Commits

Author SHA1 Message Date
Kyle Edwards
07ac0c0ae0 Merge topic 'xcframework-target-link-libraries' 
7050ac56a1 macOS: Add support for linking against .xcframework folders
93ed53790c bootstrap: Unconditionally build libjsoncpp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8619
 2023-07-27 10:06:22 -04:00
Kyle Edwards
7050ac56a1 macOS: Add support for linking against .xcframework folders 
Issue: #21752
 2023-07-26 17:00:01 -04:00
Brad King
5a164f1649 Merge topic 'jobserver-fix' 
3825d6ec98 add_custom_{command,target}: Teach JOB_SERVER_AWARE about WORKING_DIRECTORY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8644
 2023-07-26 10:19:46 -04:00
Chris Mahoney
3825d6ec98 add_custom_{command,target}: Teach JOB_SERVER_AWARE about WORKING_DIRECTORY 
Issue: #16273
 2023-07-25 11:34:22 -04:00
Kyle Edwards
ff12a57d5e exec_program(): Remove by policy CMP0153 2023-07-25 11:09:56 -04:00
Brad King
13362ff138 Merge topic 'fix-ctest-timeout-regression' 
0e8584c89c CTest: Fix regression in calculating test timeout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8647
 2023-07-25 09:21:11 -04:00
Kyle Edwards
0e8584c89c CTest: Fix regression in calculating test timeout 
Fixes: #25120
 2023-07-24 19:29:54 -04:00
Brad King
6194193a8a Merge topic 'file-REAL_PATH-relative' 
6b5f2dbbfe file(REAL_PATH): resolve symlinks before '..' components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8605
 2023-07-24 08:43:19 -04:00
Brad King
f8c3fd0c45 Merge topic 'dyndep-module-info-objlib-dependency' 
b665966933 cmComputeLinkInformation: track OBJECT library dependencies
a99b87a628 Tests/RunCMake/CXXModules: add a test for issue #25112
2870a67540 Tests/FortranOnly: add a test case for issue #25112

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8645
 2023-07-24 08:31:53 -04:00
Ben Boeckel
a99b87a628 Tests/RunCMake/CXXModules: add a test for issue #25112 
Add a test case for C++ `OBJECT` libraries providing modules to
consumers.
 2023-07-22 06:53:38 -04:00
Robert Maynard
6b5f2dbbfe file(REAL_PATH): resolve symlinks before '..' components 
Previously REAL_PATH would collapse paths before resolving any symlinks
so if `..` crossed a symlink the output from `REAL_PATH` would be wrong.

It looked like REAL_PATH did this by mistake since it was a side-effect
of ensuring we had an absolute path before resolving symlinks.
 2023-07-20 17:02:58 -04:00
Brad King
88c6dc75ba Merge topic 'command-job-server-aware' 
95941fd990 add_custom_{target,command}: Add argument JOB_SERVER_AWARE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8547
 2023-07-20 10:23:31 -04:00
Brad King
b0054dd65c Merge topic 'imported-implib-only' 
7351d590ee cmTarget: Add a way to represent imported shared library stubs
83574a4772 GeneratorExpression: Expand testing of imported location resolution
b75ff51947 Testing: Map RelWithDebInfo config in GeneratorExpression test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jason Juang <jasjuang@gmail.com>
Merge-request: !8582
 2023-07-19 10:55:30 -04:00
Chris Mahoney
95941fd990 add_custom_{target,command}: Add argument JOB_SERVER_AWARE 
Issue: #16273
 2023-07-19 10:45:33 -04:00
Robert Maynard
7351d590ee cmTarget: Add a way to represent imported shared library stubs 
Shared library stubs can be used for linking, but not at runtime.
Their role is similar to import libraries on Windows, so represent
their location with the `IMPORTED_IMPLIB` target property.

Fixes: #24940
 2023-07-18 13:21:01 -04:00
Marc Chevrier
3c685a578a LINK_OPTIONS: ensure correct dollar escaping 
Ensure correct escaping for Ninja and Makefile generators.

Fixes: #25049
 2023-07-17 15:55:58 +02:00
Brad King
802a0aefd5 Merge topic 'find_library-simplify-regex' 
f60e921262 find_library: Improve regex readability in --debug-find output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8618
 2023-07-14 08:42:11 -04:00
Thomas Schenker
f60e921262 find_library: Improve regex readability in --debug-find output 
If there is only one possible library prefix/suffix, omit the capture
group around it in the debug output.
 2023-07-13 09:48:35 -04:00
Ben Boeckel
57ef353d22 cmExperimental: refresh the C++ modules UUID 
The transitive support for Clang is a change in support for the
ecosystem.
 2023-07-13 08:40:22 -04:00
Ben Boeckel
71f1483aac Tests/RunCMake/CXXModules: require transitive usages 
Clang 17 is in a transition where it warns about transitive usages. Turn
it into an error if the flag is available to make sure we're testing the
feature properly.
 2023-07-13 08:40:22 -04:00
Brad King
a0056a96d5 Merge topic 'genex-REMOVE_DUPLICATES-empty' 
861dd60ecf Genex: Restore REMOVE_DUPLICATES preservation of empty elements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8623
 2023-07-13 08:34:22 -04:00
Brad King
861dd60ecf Genex: Restore REMOVE_DUPLICATES preservation of empty elements 
Refactoring in commit 72d116ee68 (GenEx: list oriented genexes use
cmList class, 2023-03-29, v3.27.0-rc1~205^2) accidentally caused
empty elements to be dropped by the `REMOVE_DUPLICATES` genex.
Fix it and add a test case.

Fixes: #25080
 2023-07-12 11:49:21 -04:00
Brad King
27302fa005 Merge topic 'compile-commands-modules' 
677b28dc7b Ninja: include module mapper flags in `compile_commands.json`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8611
 2023-07-12 10:02:53 -04:00
Gregor Jasny
25977e177b apple: add preliminary visionOS support 2023-07-11 20:20:25 +02:00
Ben Boeckel
677b28dc7b Ninja: include module mapper flags in compile_commands.json 
Fixes: #24618
 2023-07-09 11:04:29 -04:00
Brad King
807d9165fb Merge topic 'FetchContent-unparsed-arguments' 
9ede4cab2b FetchContent: Protect ExternalProject keywords from unknown arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !8598
 2023-06-30 09:29:28 -04:00
Brad King
1ac0dea4c8 Merge topic 'FetchContent-unparsed-arguments' into release-3.27 
9ede4cab2b FetchContent: Protect ExternalProject keywords from unknown arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !8598
 2023-06-30 09:29:27 -04:00
Brad King
4938a0cbdd Merge topic 'vs-cxxmodules-same-src-name' 
b9c99830c5 VS: Fix C++ modules in source files with the same name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8596
 2023-06-30 09:28:20 -04:00
Brad King
67cf379354 Merge topic 'vs-cxxmodules-same-src-name' into release-3.27 
b9c99830c5 VS: Fix C++ modules in source files with the same name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8596
 2023-06-30 09:28:19 -04:00
Brad King
9ede4cab2b FetchContent: Protect ExternalProject keywords from unknown arguments 
`ExternalProject_Add` treats all keyword arguments as multi-valued.
FetchContent re-orders some keyword arguments w.r.t. unparsed arguments.
Add an internal keyword argument to separate the keyword values from
following unparsed arguments.

This was exposed by commit 550f63447d (ExternalProject/FetchContent:
Support relative remote URLs, 2023-04-21, v3.27.0-rc1~156^2) by adding
`GIT_REPOSITORY` to the set of re-ordered keyword arguments.  This
caused its value to absorb following unparsed arguments.

Fixes: #25029
 2023-06-29 09:49:51 -04:00
Brad King
b9c99830c5 VS: Fix C++ modules in source files with the same name 
When multiple source files in a single target have the same name, we
already set `ObjectFileName` explicitly to avoid a `.obj` collision. For
C++ module sources, set `Module{Output,Dependencies}File` to avoid
`.ifc` and `.module.json` collisions.

Fixes: #25038
 2023-06-28 06:43:10 -04:00
Brad King
75b573a628 Deprecate Visual Studio 12 2013 generator 
Update documentation to mark the generator deprecated.  Add a warning at
the end of generation plus an option to turn off the warning.
 2023-06-26 12:41:18 -04:00
Brad King
61bb728c0c Merge topic 'imported-target-framework-path' 
d605f728f7 macOS: Allow IMPORTED_LOCATION to be a framework folder

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8586
 2023-06-26 09:47:30 -04:00
Brad King
d599c9e92e Merge topic 'support_nvhpc_versions_without_isystem' 
f73ae7c510 NVHPC: Support nvfortran versions that don't support isystem

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8588
 2023-06-26 09:44:57 -04:00
Brad King
b7810bfb18 Merge topic 'support_nvhpc_versions_without_isystem' into release-3.27 
f73ae7c510 NVHPC: Support nvfortran versions that don't support isystem

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8588
 2023-06-26 09:44:56 -04:00
Brad King
7af90b7bf7 Merge topic 'link-depends-is-OFF' 
5945a98ced link dependencies: deactivate the feature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8587
 2023-06-26 09:43:56 -04:00
Robert Maynard
f73ae7c510 NVHPC: Support nvfortran versions that don't support isystem 
Fixes: #25019
 2023-06-23 12:14:09 -04:00
Kyle Edwards
d605f728f7 macOS: Allow IMPORTED_LOCATION to be a framework folder 
Issue: #24946
 2023-06-23 12:07:18 -04:00
Marc Chevrier
5945a98ced link dependencies: deactivate the feature 
Unfortunately it breaks in combination with LTO due to a bug in the GNU
linker.

Fixes: #25014
 2023-06-23 10:35:04 -04:00
Kyle Edwards
70f36de1e5 File set: Allow absolute CMAKE_INSTALL_INCLUDEDIR 
When install(TARGETS) and install(EXPORT) were called with file sets
and an absolute CMAKE_INSTALL_INCLUDEDIR, "${_IMPORT_PREFIX}/" was
still being prepended to the base directory and files, resulting in
incorrect paths. Don't prepend this when absolute paths are used.

Fixes: #25010
 2023-06-20 11:39:11 -04:00
Brad King
8bfef726fa Merge topic 'cmList-SUBLIST-regression' 
1cfaed0684 list(): restore SUBLIST behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8569
 2023-06-20 09:25:40 -04:00
Marc Chevrier
1cfaed0684 list(): restore SUBLIST behavior 
Fixes: #25002
 2023-06-16 15:14:03 +02:00
Marc Chevrier
711d1da125 FindPython: add capability to select python version for the tests 2023-06-15 15:28:55 +02:00
Brad King
ed37038a1c Merge topic 'cross-compiling-emulator-env-var' 
7005dea005 CrossCompiling: Load CMAKE_CROSSCOMPILING_EMULATOR from environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8543
 2023-06-14 09:18:45 -04:00
Brad King
536c1de1d4 Drop Visual Studio 11 2012 generator 
This generator has been deprecated since CMake 3.25.  Remove it.
 2023-06-13 14:20:48 -04:00
Matt McCormick
7005dea005 CrossCompiling: Load CMAKE_CROSSCOMPILING_EMULATOR from environment 
Read `CMAKE_CROSSCOMPILING_EMULATOR` from an environment variable of the
same name if not specified with `-D` or an initial cache value.

Along with existing environment variable settings such as
`CMAKE_TOOLCHAIN_FILE`, cross compilation configuration can be more
completely set via environment variables.

Suggested-by: Henry Schreiner <henryschreineriii@gmail.com>
 2023-06-13 13:58:44 -04:00
Brad King
37b4eda100 Merge topic 'test-no-git' 
15d9d591bd Tests: Require git to enable RunCMake.CMP0150 test
0c2610bd30 Tests: Find GIT_EXECUTABLE early enough to use in all tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8556
 2023-06-13 10:54:57 -04:00
Brad King
15d9d591bd Tests: Require git to enable RunCMake.CMP0150 test 
The test added by commit 550f63447d (ExternalProject/FetchContent:
Support relative remote URLs, 2023-04-21, v3.27.0-rc1~156^2) covers
Git-specific functionality, and requires a `git` tool to be available.
 2023-06-12 17:56:53 -04:00
Brad King
eec017cf8b Merge topic 'add_test-empty-args' 
1df3287bf6 add_test: Restore support for empty test arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8551
 2023-06-12 06:41:41 -04:00
Brad King
a70fe8ec82 Merge topic 'add_test-empty-args' into release-3.27 
1df3287bf6 add_test: Restore support for empty test arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8551
 2023-06-12 06:41:40 -04:00