mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 18:51:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
63,752 Commits 2 Branches 401 Tags
b7379f9e212d645c3b60e88a58f3c59458575a1c
Commit Graph

63752 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King b7379f9e21 zlib: Update script to get zlib 1.2.13 
Issue: #25576
 2024-01-10 10:28:46 -05:00
Brad King 3160b136b2 Merge topic 'vs-scan-for-modules' into release-3.28 
405dc7d19c Tests/CXXModules/scan_properties: use `ixx` extension
029ddc3410 cmVisualStudio10TargetGenerator: always specify scanning
6c9614cbf4 Tests/CXXModules: add a test case for VS generation without flags
34f4423851 cmVisualStudio10TargetGenerator: fix typo in flag name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9104
 2024-01-10 10:17:01 -05:00
Brad King 2858af8d6b Merge topic 'cxxmodules-no-unity' into release-3.28 
63bbb3768d cmLocalGenerator: ignore scanned sources for unity builds
76b5383123 cmGlobalGenerator: add unity sources after computing target compile features
7fc2a83fe6 Tests/CXXModules: add a test with unity build support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9118
 2024-01-10 10:15:44 -05:00
Brad King 3d14d84443 Merge topic 'makefile-depfile' into release-3.28 
7198f0d149 Makefile: Fix double escaping when DEPFILE is used
5162ff64d4 Makefile: Reduce string copies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9138
 2024-01-10 10:14:23 -05:00
Orkun Tokdemir 7198f0d149 Makefile: Fix double escaping when DEPFILE is used 
In commit cfd8a5ac1f (Makefiles: Add support of DEPFILE for
add_custom_command, 2020-12-04, v3.20.0-rc1~237^2~1) we added a
`ConvertToOutputPath` call on a path given to the `depends` field of
`WriteMakeRule`.  The latter already handles escaping for Makefile
syntax.

Fixes: #25554
 2024-01-09 10:44:43 -05:00
Ben Boeckel 405dc7d19c Tests/CXXModules/scan_properties: use ixx extension 
This ensures that Visual Studio is told not to scan this explicitly.
 2024-01-09 09:47:47 -05:00
Orkun Tokdemir 5162ff64d4 Makefile: Reduce string copies 2024-01-08 11:58:04 -05:00
Brad King 67ba114875 Merge topic 'fix-openbsd' into release-3.28 
1fafe35e81 Source: Restore compilation on OpenBSD

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9085
 2024-01-08 09:30:55 -05:00
Ben Boeckel 029ddc3410 cmVisualStudio10TargetGenerator: always specify scanning 
Set that sources should not be scanned on a target-wide basis and then
enable on a per-TU basis as needed.

Fixes: #25519
 2024-01-06 11:18:57 -05:00
Ben Boeckel 6c9614cbf4 Tests/CXXModules: add a test case for VS generation without flags 
Previously, the `ScanSourceForModuleDependencies` flag was not added to
the VS project if "nothing" prompted custom flags.

See: #25519
 2024-01-06 11:18:57 -05:00
Ben Boeckel 34f4423851 cmVisualStudio10TargetGenerator: fix typo in flag name 
It is case insensitive, so this only matches the official flag name and
still works.
 2024-01-06 11:18:57 -05:00
Rafael Sadowski 1fafe35e81 Source: Restore compilation on OpenBSD 
We cannot use `OpenBSD` as a name, it is defined in `sys/param.h`.
 2024-01-05 15:36:44 -05:00
Ben Boeckel 63bbb3768d cmLocalGenerator: ignore scanned sources for unity builds 2024-01-05 14:21:27 -05:00
Ben Boeckel 76b5383123 cmGlobalGenerator: add unity sources after computing target compile features 
We need to know which sources will be scanned for C++ module
dependencies in order to exclude them from unity builds.  The
addition of unity sources will not change the set of features.
 2024-01-05 14:19:42 -05:00
Brad King 47bfca8494 Merge topic 'doc-get-properties-inherited' into release-3.28 
8086badba4 Help: Fix wrong return values for unset inherited properties
1ca5ec67b0 Help: Add missing DIRECTORY keyword to set_tests_properties() signature
34379f005b Help: Use <variable> consistently in property getter commands
29ccc9a4cd Help: Use <xxx> for non-keyword arguments in property command signatures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9131
 2024-01-05 10:18:41 -05:00
Brad King f6f33385d7 Merge topic 'check_language_propagate_hip_platform' into release-3.28 
ce9c6d0994 HIP: Propagate CMAKE_HIP_PLATFORM from/to the test project in check_language
9ba3fc91e5 HIP: Really forward CMAKE_HIP_HOST_COMPILER in check_language(HIP)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9121
 2024-01-05 10:16:52 -05:00
Ben Boeckel 7fc2a83fe6 Tests/CXXModules: add a test with unity build support 
C++ module-using TUs cannot participate in unity builds. Add a test case
for this situation.
 2024-01-05 05:03:29 -05:00
Craig Scott 8086badba4 Help: Fix wrong return values for unset inherited properties 
Since ff6234509e (Help: Clarify behavior of INHERITED properties, 2018-03-21),
the docs for some get_..._property() commands incorrectly describe
the behavior for inherited properties. When a property is not set, even
in a parent scope, the returned result from the get_..._property()
command is the same whether the property is inherited or not.
The docs incorrectly stated that an empty string would be returned
for inherited properties in such cases.
 2024-01-05 17:40:16 +11:00
Craig Scott 1ca5ec67b0 Help: Add missing DIRECTORY keyword to set_tests_properties() signature 2024-01-05 16:45:27 +11:00
Craig Scott 34379f005b Help: Use <variable> consistently in property getter commands 
Property-related commands used a mix of <VAR>, <var>, or
<variable> to specify the variable to store the result in. The <VAR>
form is particularly confusing, since being uppercase it looks more
like a keyword. Use <variable> consistently across all the commands
so that the behavior is clear.
 2024-01-05 15:37:39 +11:00
Craig Scott 29ccc9a4cd Help: Use <xxx> for non-keyword arguments in property command signatures 2024-01-05 15:31:39 +11:00
Brad King b03e3c5251 Merge branch 'release-3.27' into release-3.28 2024-01-04 11:50:29 -05:00
Brad King f479139ef8 Merge branch 'HELP-string_LENGTH-link-error' into release-3.27 
Merge-request: !9113
 2024-01-04 11:49:47 -05:00
Brad King f11f0f52b7 Merge topic 'HELP-string_LENGTH-link-error' into release-3.28 
9702a01dc9 Help: string(LENGTH): Fix synopsis link to command description

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9113
 2024-01-04 11:44:13 -05:00
Brad King cab0ec1f75 Merge topic 'revert-ExternalProject-download-byproducts' into release-3.28 
fd3c9876c6 ExternalProject: revert `BYPRODUCTS` for download outputs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9097
 2024-01-04 11:35:10 -05:00
Gergely Meszaros ce9c6d0994 HIP: Propagate CMAKE_HIP_PLATFORM from/to the test project in check_language 
Fixes: #25541
 2024-01-04 11:25:15 -05:00
Gergely Meszaros 9ba3fc91e5 HIP: Really forward CMAKE_HIP_HOST_COMPILER in check_language(HIP) 
In commit b3e92775ab (HIP: Add CMAKE_HIP_HOST_COMPILER when compiler is
NVCC, 2023-09-25, v3.28.0-rc1~44^2~2) we accidentally left this out.
 2024-01-03 18:15:21 -05:00
Ben Boeckel fd3c9876c6 ExternalProject: revert BYPRODUCTS for download outputs 
Xcode has been reported to not work at all with this when
ExternalProject projects share download files.

Revert commit 872daff159 (ExternalProject: declare byproducts for the
download step, 2023-09-21, v3.28.0-rc1~27^2) pending further
investigation.

Fixes: #25525
 2024-01-03 14:18:35 -05:00
Marc Chevrier 9702a01dc9 Help: string(LENGTH): Fix synopsis link to command description 
Make the link target explicit to avoid ambiguity with `JSON LENGTH`.

Fixes: #25546
 2024-01-03 14:14:18 -05:00
Brad King a0a5a5b85a Merge topic 'cxxmodules-no-compile-commands-modmap' into release-3.28 
73fbad3d93 cmNinjaTargetGenerator: use scan flag for modmap usage in exported commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9100
 2024-01-03 13:53:04 -05:00
Craig Scott cc3c630daf Merge topic 'cxxmodules-error-message-improvement' into release-3.28 
4962eba981 cmDyndepCollation: clarify CXX_MODULES-without-BMI error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Yaraslau <yaraslau.tamashevich@gmail.com>
Merge-request: !9103
 2024-01-03 07:19:08 -05:00
Craig Scott fba975dead Merge topic 'doc-dynamic-resource-spec-file' into release-3.28 
9b63f92f27 Help: Update missed text for dynamically generated resource spec files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9117
 2024-01-02 06:00:59 -05:00
Craig Scott 9b63f92f27 Help: Update missed text for dynamically generated resource spec files 2024-01-01 17:37:14 +11:00
Craig Scott d12c9d62f4 Merge topic 'fix-redirect-links' into release-3.28 
5a7927d028 Help: update lua.org links to be HTTPS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9114
 2023-12-31 19:59:10 -05:00
Ben Boeckel 5a7927d028 Help: update lua.org links to be HTTPS 
This is now a permanent redirect, so update links accordingly.
 2024-01-01 11:32:32 +11:00
Craig Scott ea58c2630f Merge topic 'doc-toolchains-apple' into release-3.28 
315cf74025 Help: Note CMAKE_IOS_INSTALL_COMBINED deprecation in toolchains example
af2e4379fc Help: Fix typo not accounting for addition of visionOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9112
 2023-12-31 19:29:43 -05:00
Craig Scott 315cf74025 Help: Note CMAKE_IOS_INSTALL_COMBINED deprecation in toolchains example 2023-12-30 18:38:05 +11:00
Craig Scott af2e4379fc Help: Fix typo not accounting for addition of visionOS 2023-12-30 18:36:34 +11:00
Ben Boeckel 4962eba981 cmDyndepCollation: clarify CXX_MODULES-without-BMI error message 
Fixes: #25493
 2023-12-26 11:07:15 -05:00
Marc Chevrier 73d0160134 Merge topic 'Ninja-LINK_OPTIONS-with-newlines' into release-3.28 
255c2e1430 Ninja: LINK_OPTIONS property should support newlines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9096
 2023-12-23 05:39:09 -05:00
Ben Boeckel 73fbad3d93 cmNinjaTargetGenerator: use scan flag for modmap usage in exported commands 
See: https://discourse.cmake.org/t/how-to-control-the-location-of-the-c-20-binary-module-interface-bmi-output-directory/7968
 2023-12-22 16:18:18 -05:00
Marc Chevrier 255c2e1430 Ninja: LINK_OPTIONS property should support newlines 
Fixes: #25513
 2023-12-20 17:05:09 +01:00
Brad King 158316dc0c Merge topic 'UsePkgConfig-trailing-whitespace' into release-3.28 
61436858e4 UsePkgConfig: Restore removal of trailing whitespace from pkg-config output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9094
 2023-12-20 09:03:38 -05:00
Jason E. Hale 61436858e4 UsePkgConfig: Restore removal of trailing whitespace from pkg-config output 
Since commit f73a5bfaa9 (UsePkgConfig: Replace exec_program() with
execute_process(), 2023-07-24, v3.28.0-rc1~321^2~6), trailing whitespace
was introduced into libraries linked, which violates CMP0004.
 2023-12-19 15:35:24 -05:00
Brad King e9a3f3fb02 Merge topic 'Xcode-Check-Imported-Framework' into release-3.28 
defbfd6f55 Xcode: Restore support for standalone IMPORTED_LOCATION_<CONFIG>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9082
 2023-12-19 08:03:59 -05:00
Marc Chevrier defbfd6f55 Xcode: Restore support for standalone IMPORTED_LOCATION_<CONFIG> 
In commit 878ae03832 (macOS: IMPORTED framework: Honor SYSTEM target
property in all cases, 2023-08-27, v3.28.0-rc1~162^2) we broke support
for `IMPORTED_LOCATION_<CONFIG>` without `IMPORTED_CONFIGURATIONS`.
Previously it worked if the importing project's configurations match the
set of `IMPORTED_LOCATION_<CONFIG>` properties set.  Fix that case.

Fixes: #25506
Issue: #25515
 2023-12-18 10:18:25 -05:00
Brad King e42eaa4342 Merge topic 'FindCUDAToolkit-cupti' into release-3.28 
04959e0285 Tests: Verify CUDA::cupti existence on a subset of machines
09a3c8b46b CUDAToolkit: Correctly search all include paths from compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9072
 2023-12-15 09:31:59 -05:00
Brad King a903e3b540 Merge topic 'FindBoost-1.84' into release-3.28 
9dc0392df0 FindBoost: Add support for Boost 1.84

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9075
 2023-12-15 09:30:55 -05:00
Robert Maynard 04959e0285 Tests: Verify CUDA::cupti existence on a subset of machines 
When we know that the cupti library exists explicitly request the CUDA Toolkit test to verify the existence
 2023-12-14 14:05:28 -05:00
Robert Maynard 09a3c8b46b CUDAToolkit: Correctly search all include paths from compiler 
The CUDAToolkit usage of `find_path( PATHS )` was incorrectly
quoting a list of paths causing none of them to be used.
 2023-12-14 14:04:53 -05:00