mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-26 08:29:54 -06:00
Code Issues Packages Projects Releases Wiki Activity
65,226 Commits 2 Branches 386 Tags
a50982b6373ef7f88820283bdfd2c9d3d0e36634
Commit Graph

35357 Commits

Author SHA1 Message Date
Brad King
a50982b637 Merge topic 'cpack-path-simplify' 
023720e10a cpack: Simplify config file selection
cc3c603061 cpack: Simplify package directory selection logic
a9ad70de76 Source: Avoid using CollapseFullPath just to get parent directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9294
 2024-02-29 08:07:24 -05:00
Brad King
9c69bd8d42 Merge topic 'cxxmodules-no-export-basedirs-as-include-paths' 
65bd837786 Merge branch 'backport-3.28-cxxmodules-no-export-basedirs-as-include-paths'
028f3134e5 cmExportFileGenerator: only export include paths for HEADERS file sets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9295
 2024-02-29 08:02:29 -05:00
Kitware Robot
76b0e21848 CMake Nightly Date Stamp 2024-02-29 00:01:13 -05:00
Brad King
65bd837786 Merge branch 'backport-3.28-cxxmodules-no-export-basedirs-as-include-paths' 2024-02-28 09:20:15 -05:00
Brad King
c481ddda14 Merge topic 'curl-tls-version' 
434fe8a34b file(DOWNLOAD|UPLOAD): Add CMAKE_TLS_VERSION environment variable
fb9a6cf909 file(DOWNLOAD|UPLOAD): Add CMAKE_TLS_VERSION variable
8e6776b9f3 file(DOWNLOAD|UPLOAD): Add TLS_VERSION option for https connections

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9290
 2024-02-28 09:03:20 -05:00
Brad King
7c286ed5ad Merge topic 'ctest-upload-xml-time' 
b47ccc6ba0 ctest: include "Time" element in Upload.xml

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9292
 2024-02-28 08:48:40 -05:00
Brad King
434fe8a34b file(DOWNLOAD|UPLOAD): Add CMAKE_TLS_VERSION environment variable 
Issue: #25701
 2024-02-28 08:40:27 -05:00
Brad King
fb9a6cf909 file(DOWNLOAD|UPLOAD): Add CMAKE_TLS_VERSION variable 
Issue: #25701
 2024-02-28 08:40:27 -05:00
Brad King
8e6776b9f3 file(DOWNLOAD|UPLOAD): Add TLS_VERSION option for https connections 
Add an option to specify the minimum allowed TLS version for https
connections.

Issue: #25701
 2024-02-28 08:40:14 -05:00
Ben Boeckel
028f3134e5 cmExportFileGenerator: only export include paths for HEADERS file sets 2024-02-28 05:26:10 -05:00
Kitware Robot
9c43492989 CMake Nightly Date Stamp 2024-02-28 00:01:21 -05:00
Brad King
023720e10a cpack: Simplify config file selection 2024-02-27 14:51:48 -05:00
Brad King
cc3c603061 cpack: Simplify package directory selection logic 2024-02-27 14:51:47 -05:00
Brad King
a9ad70de76 Source: Avoid using CollapseFullPath just to get parent directory 2024-02-27 14:51:47 -05:00
Zack Galbreath
b47ccc6ba0 ctest: include "Time" element in Upload.xml 
Add a `<Time>` element to Upload.xml that contains the Unix timestamp
when this file was generated. This matches the data recorded by CTest in its
other XML files.
 2024-02-27 13:51:11 -05:00
Brad King
f8eadaa8b3 Merge topic 'cmDebugTools-disable-with-env' 
68b32ff801 cmDebugTools: offer a way to disable `CM_DBG` output at runtime

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9287
 2024-02-27 09:09:52 -05:00
Brad King
65791d44e4 Merge topic 'cxxmodules-fileset-cache-fullpath' 
0a18f9baad cmGeneratorTarget: collapse paths before querying the fileset cache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9286
 2024-02-27 09:06:25 -05:00
Brad King
4ff4417b54 Merge topic 'cxxmodules-fileset-cache-fullpath' into release-3.29 
0a18f9baad cmGeneratorTarget: collapse paths before querying the fileset cache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9286
 2024-02-27 09:06:24 -05:00
Kitware Robot
3b7e8e966f CMake Nightly Date Stamp 2024-02-27 00:01:10 -05:00
Brad King
610e5b3d94 Merge topic 'swift-exe-module-name' 
f292e28b84 Swift: Ninja: Pass module name to all swift builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9282
 2024-02-26 10:19:22 -05:00
Kitware Robot
7a7c9f5295 CMake Nightly Date Stamp 2024-02-26 00:01:44 -05:00
Kitware Robot
22c21f7aa0 CMake Nightly Date Stamp 2024-02-25 00:01:12 -05:00
Ben Boeckel
68b32ff801 cmDebugTools: offer a way to disable CM_DBG output at runtime 
This allows information to be gathered while debugging while also
supporting running the test suite with the debugging enabled to test
CMake module changes without tripping `stderr` output checkers.
 2024-02-24 17:22:13 -05:00
Ben Boeckel
0a18f9baad cmGeneratorTarget: collapse paths before querying the fileset cache 
Observed with paths with `../` when outside of the source tree. I
attempted to reproduce a test suite case for it but could not make it
happen.
 2024-02-24 17:17:39 -05:00
Kitware Robot
709f4ea1de CMake Nightly Date Stamp 2024-02-24 00:01:16 -05:00
Evan Wilde
f292e28b84 Swift: Ninja: Pass module name to all swift builds 
Executables that don't export a public API should not emit a
swiftmodule, but the swift modulename is observable from within the
program, so we should still set the module name on executable builds.

Fixes: #25710
 2024-02-23 11:12:05 -05:00
Brad King
7f1bdcc714 Merge topic 'vs-UseDebugLibraries' 
721d8b192a VS: Add UseDebugLibraries to vcxproj files by default
47136b6959 VS: Suppress more MSBuild defaults affected by UseDebugLibraries
82a174182a cmVisualStudioGeneratorOptions: Add UsingDebugRuntime method
f498032141 cmVisualStudioGeneratorOptions: Rename {IsDebug => UsingDebugInfo}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9275
 2024-02-23 08:35:04 -05:00
Kitware Robot
87f270800c CMake Nightly Date Stamp 2024-02-23 00:01:11 -05:00
Brad King
dc45b20aca CMake 3.29.0-rc2 2024-02-22 09:40:22 -05:00
Brad King
721d8b192a VS: Add UseDebugLibraries to vcxproj files by default 
Use heuristics to select a reasonable value.  Add policy CMP0162
to provide compatibility with existing projects.

Fixes: #25327
 2024-02-22 08:43:16 -05:00
Brad King
47136b6959 VS: Suppress more MSBuild defaults affected by UseDebugLibraries 
Extend commit 67de5b7b82 (VS: Suppress MSBuild default settings affected
by UseDebugLibraries, 2024-02-13) to cover a `Microsoft.Cl.Common.props`
default from VS 2015 and older.
 2024-02-22 08:42:58 -05:00
Brad King
14ed766e12 Merge topic 'preset-includes-macro-expansion' 
1a38ffc656 presets: Expand more macros in the `include` directive

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9108
 2024-02-22 08:32:10 -05:00
Brad King
2ce2aebb6f Merge topic 'restore-link-interface-objlib-with-unity' 
5b8e9e068f Restore support for TARGET_OBJECTS in link interfaces with unity builds
1313c78a9c Tests: Update RunCMake.TargetObjects cmake_minimum_required version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9279
 2024-02-22 08:26:12 -05:00
Brad King
312d0ccb6b Merge topic 'restore-link-interface-objlib-with-unity' into release-3.29 
5b8e9e068f Restore support for TARGET_OBJECTS in link interfaces with unity builds
1313c78a9c Tests: Update RunCMake.TargetObjects cmake_minimum_required version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9279
 2024-02-22 08:26:11 -05:00
Kitware Robot
54c36c7557 CMake Nightly Date Stamp 2024-02-22 00:01:19 -05:00
Brad King
5b8e9e068f Restore support for TARGET_OBJECTS in link interfaces with unity builds 
This was broken by commit df08c37a42 (cmGlobalGenerator: Add unity/pch
sources after computing compile features, 2024-02-02, v3.28.3~1^2~1^2),
and 3.28.2's commit 76b5383123 (cmGlobalGenerator: add unity sources
after computing target compile features, 2024-01-01, v3.28.2~17^2~1).

The problem is very similar to that fixed by commit 4e8f24e977 (PCH:
Clear link interface cache when adding PCH object to it, 2022-01-24,
v3.23.0-rc1~44^2~9).  Generalize that fix.

Fixes: #25696
 2024-02-21 17:08:57 -05:00
Cristian Le
1a38ffc656 presets: Expand more macros in the include directive 
Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>
 2024-02-21 13:47:08 -05:00
Brad King
07c219da13 Merge topic 'cxxmodules-transitive-modules-usage' 
ec348ee4b9 cmGeneratorTarget: discover synthetic targets recursively
67466ddf65 cmExportFileGenerator: export link libraries as-is
a2e3e61a31 Tests/CXXModules: test transitive modules usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9273
 2024-02-21 13:34:36 -05:00
Brad King
c66396699b Merge topic 'cxxmodules-transitive-modules-usage' into release-3.29 
ec348ee4b9 cmGeneratorTarget: discover synthetic targets recursively
67466ddf65 cmExportFileGenerator: export link libraries as-is
a2e3e61a31 Tests/CXXModules: test transitive modules usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9273
 2024-02-21 13:34:34 -05:00
Kitware Robot
f5b0fe1899 CMake Nightly Date Stamp 2024-02-21 00:01:17 -05:00
Ben Boeckel
ec348ee4b9 cmGeneratorTarget: discover synthetic targets recursively 
Fixes: #25288
 2024-02-20 10:53:31 -05:00
Ben Boeckel
67466ddf65 cmExportFileGenerator: export link libraries as-is 
This allows for transitive modules to work because
`$<COMPILE_ONLY>`-wrapped dependencies do not end up in the
`linked-target-dirs` collator property. Test suite exported property
tests updated to account for the change.
 2024-02-20 10:53:31 -05:00
Brad King
82a174182a cmVisualStudioGeneratorOptions: Add UsingDebugRuntime method 2024-02-20 10:48:31 -05:00
Brad King
f498032141 cmVisualStudioGeneratorOptions: Rename {IsDebug => UsingDebugInfo} 
The latter name is more precise.
 2024-02-20 10:48:31 -05:00
Brad King
3a171009e9 Merge topic 'vs-UseDebugLibraries' 
b814641444 VS: Add [CMAKE_]VS_USE_DEBUG_LIBRARIES options to control UseDebugLibraries
67de5b7b82 VS: Suppress MSBuild default settings affected by UseDebugLibraries
0ae372daee VS: Factor out common MS tool configuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9270
 2024-02-20 10:37:32 -05:00
Brad King
9e8731b2ff Merge topic 'vs-17.10' 
d256581bb0 VS: Fix '-T version=14.40' under VS 17.10 preview 1
3a7fbd04c8 VS: Verify toolset version= field format more strictly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9271
 2024-02-20 10:36:01 -05:00
Brad King
d2df2e94e5 Merge topic 'vs-17.10' into release-3.29 
d256581bb0 VS: Fix '-T version=14.40' under VS 17.10 preview 1
3a7fbd04c8 VS: Verify toolset version= field format more strictly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9271
 2024-02-20 10:36:00 -05:00
Brad King
5bc5a485fa Merge topic 'cxxmodules-transitive-target-usage' 
8b6fc81fc3 cmTarget: copy link libraries from the right properties
d4a517f82a Tests/CXXModules: add a test with transitive targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9265
 2024-02-20 10:30:26 -05:00
Brad King
dcdbdd82d5 Merge topic 'cxxmodules-transitive-target-usage' into release-3.29 
8b6fc81fc3 cmTarget: copy link libraries from the right properties
d4a517f82a Tests/CXXModules: add a test with transitive targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9265
 2024-02-20 10:30:25 -05:00
Brad King
d256581bb0 VS: Fix '-T version=14.40' under VS 17.10 preview 1 
VS 17.10 preview 1 comes with toolset `v143` version `14.40`.  This is
the first time that the first three digits of the version do not match
the toolset name.  Add a special case to map version `14.40` back to
toolset `v143`.
 2024-02-20 06:23:34 -05:00