mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 06:47:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
60,266 Commits 2 Branches 401 Tags
b82f9dce70cc7133a53b84c8dfb78de7270c2086
Commit Graph

60266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King b82f9dce70 Merge topic 'CheckSymbolExists-restore-newline' 
9273b8f421 CheckSymbolExists: Restore newline at end of test source

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Petr Nechaev <petr.nechaev@cogentembedded.com>
Merge-request: !7979
 2022-12-05 12:51:24 -05:00
Kyle Edwards 3baf766cec Merge topic 'clang-tidy-module-string-concatenation-fix' 
b1366e215e clang-tidy module: fix offset issue with last string concat operand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7984
 2022-12-05 11:39:57 -05:00
Craig Scott 2243bba402 Merge branch 'release-3.25' 2022-12-05 06:23:28 -05:00
Craig Scott d09dc11911 Merge topic 'FetchContent-SYSTEM' 
4b85141f83 FetchContent: Don't pass SYSTEM through to sub-build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7977
 2022-12-05 06:23:28 -05:00
Craig Scott 2d74078d37 Merge topic 'FetchContent-SYSTEM' into release-3.25 
4b85141f83 FetchContent: Don't pass SYSTEM through to sub-build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7977
 2022-12-05 06:23:27 -05:00
Kitware Robot 03da25a44a CMake Nightly Date Stamp 2022-12-05 00:01:22 -05:00
Kitware Robot 2e3ae48819 CMake Nightly Date Stamp 2022-12-04 00:01:16 -05:00
Kyle Edwards b1366e215e clang-tidy module: fix offset issue with last string concat operand 2022-12-03 13:56:56 -05:00
Kitware Robot 3d019b4133 CMake Nightly Date Stamp 2022-12-03 00:01:17 -05:00
Andrey Vostrikov 9273b8f421 CheckSymbolExists: Restore newline at end of test source 
Refactoring in commit db76876db5 (Modules: Use new SOURCES_FROM_*
try_compile (1/2), 2022-09-26, v3.25.0-rc1~74^2~1) accidentally dropped
the final newline of the test source, which was previously provided by
the input to `configure_file`.  The C standard requires a newline at the
end of file, so add one explicitly.

Signed-off-by: Andrey Vostrikov <andrey.vostrikov@cogentembedded.com>
 2022-12-02 09:20:09 -05:00
Brad King 7ea665b74d Merge topic 'file-GET_RUNTIME_DEPENDENCIES-transitive-rpath' 
136622a2b2 file(GET_RUNTIME_DEPENDENCIES): propagate transitive parent's rpath
4aa3149c67 Tests: Simplify RunCMake.file-GET_RUNTIME_DEPENDENCIES case cleaning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7968
 2022-12-02 09:01:51 -05:00
Alex Lapenkou 136622a2b2 file(GET_RUNTIME_DEPENDENCIES): propagate transitive parent's rpath 
This fixes incorrect runtime dependency resolution when the dependency
is located in rpaths of a transitive parent.  Instead of supplying only
the rpaths of the immediate parent, it combines the rpaths of all
transitive parents and passes them down.

Fixes: #24172
 2022-12-02 09:00:06 -05:00
Brad King 399d62db8b Merge topic 'cxxmodules-vs' 
52c21cbbda ci: enable C++20 module testing with the VS 2022 generator
2991e92ea7 cmExperimental: recycle C++20 module support UUID
82833fb3c0 Help/dev/experimental: document C++20 module limitations
388acfd46d Tests/RunCMake/CXXModules: add support for Visual Studio
069a32b03c Tests/RunCMake/CXXModules: split out collation-requiring tests
ef03a3a2f5 Tests/RunCMake/CXXModules: factor out generator support detection
736123464f Tests/RunCMake/CXXModules: update `NoDyndepSupport` for VS2019 and older
4a4ce031cd Tests/RunCMake/CXXModules: catch VS circular error message
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7972
 2022-12-02 08:24:05 -05:00
Brad King 3c07549b51 Merge topic 'ci-os-arch' 
6a38c5dccb gitlab-ci: replace 'linux' tags with 'linux-x86_64' in upload jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7976
 2022-12-02 08:22:33 -05:00
Craig Scott 4b85141f83 FetchContent: Don't pass SYSTEM through to sub-build 
If we don't filter out SYSTEM from the arguments we pass
through to ExternalProject_Add(), it gets appended as a
list item to whatever arguments precede it because
ExternalProject_Add() doesn't recognize it as a keyword.

Fixes: #24201
 2022-12-02 18:41:18 +11:00
Kitware Robot b6a84d7cc1 CMake Nightly Date Stamp 2022-12-02 00:01:10 -05:00
Ben Boeckel 52c21cbbda ci: enable C++20 module testing with the VS 2022 generator 2022-12-01 11:42:46 -05:00
Ben Boeckel 2991e92ea7 cmExperimental: recycle C++20 module support UUID 
Visual Studio support warrants a new ID.
 2022-12-01 11:42:46 -05:00
Ben Boeckel 82833fb3c0 Help/dev/experimental: document C++20 module limitations 2022-12-01 11:42:46 -05:00
Ben Boeckel 388acfd46d Tests/RunCMake/CXXModules: add support for Visual Studio 2022-12-01 11:42:46 -05:00
Ben Boeckel 069a32b03c Tests/RunCMake/CXXModules: split out collation-requiring tests 
Visual Studio does not currently have a place to insert the logic
required to implement this test, so skip it if possible.
 2022-12-01 11:42:46 -05:00
Ben Boeckel ef03a3a2f5 Tests/RunCMake/CXXModules: factor out generator support detection 
This keeps the condition to a readable limit.
 2022-12-01 11:42:46 -05:00
Ben Boeckel 736123464f Tests/RunCMake/CXXModules: update NoDyndepSupport for VS2019 and older 2022-12-01 11:42:46 -05:00
Ben Boeckel 4a4ce031cd Tests/RunCMake/CXXModules: catch VS circular error message 2022-12-01 08:33:43 -05:00
Ben Boeckel 7eb9b45861 Tests/RunCMake/CXXModules: mask scanning checks without control 
In Visual Studio, there is no mechanism to tell scanning apart from
non-scanning, so skip the sanity checks.
 2022-12-01 08:33:43 -05:00
Ben Boeckel f0899e46fb cmVisualStudio10TargetGenerator: write C++ module elements 2022-12-01 08:33:43 -05:00
Ben Boeckel b0283aaa7c cmVisualStudio10TargetGenerator: ask the generator for dyndep support 2022-12-01 08:33:43 -05:00
Ben Boeckel 9ee7ee1fc2 cmGlobalVisualStudioVersionedGenerator: check for C++ module support 2022-12-01 08:33:43 -05:00
Ben Boeckel fce359c5de cmGlobalVisualStudioVersionedGenerator: support dyndep in VS2022 and up 2022-12-01 08:33:43 -05:00
Ben Boeckel 5b16a0e568 cmGlobalVisualStudio7Generator: make SupportsCxxModuleDyndep protected 
The generator target will want to ask this question when determining
whether C++ modules are supported or not.
 2022-12-01 08:33:43 -05:00
Brad King 4f9ec5a9be Merge topic 'cxxmodules-collation-logic-refactor' 
f4a17b29d3 cmDyndepCollation: factor out metadata writing for dyndep
2f93a272d0 cmDyndepCollation: factor out parsing dyndep information
3fc2de5c74 cmDyndepCollation: factor out writing C++ module info from Ninja

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7971
 2022-12-01 08:05:21 -05:00
Brad King 2a139018ce Merge topic 'find_cudatoolkit_avoid_nvhpc_symlinks' 
9d012b1f69 FindCUDAToolkit: Ensure that paths provided have no symlinks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7974
 2022-12-01 08:02:49 -05:00
Brad King 5f7b953342 Merge topic 'watcom-win16' 
ef9ce3aadb OpenWatcom: Add support for 16-bit Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7975
 2022-12-01 08:01:49 -05:00
Brad King c44bae98cd Merge topic 'msys-pkgconf' 
903ae3c71b MSYS Makefiles: Modernize search paths for common MSYS 'make' locations
2057066e05 FindMsys: Modernize search paths for common MSYS locations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7955
 2022-12-01 08:00:24 -05:00
Brad King 907402b147 Merge topic 'cmstrcat-move-first-arg' 
beba50bd61 cmStrCat(): optimize when first argument is an rvalue string
d6f2a7ab4b cmStringCommand: remove use of cmCatViews()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7969
 2022-12-01 07:58:05 -05:00
Brad King 6a38c5dccb gitlab-ci: replace 'linux' tags with 'linux-x86_64' in upload jobs 
These were missed by commit 94d82d91d5 (gitlab-ci: replace 'linux'
tags with 'linux-x86_64', 2022-11-30).
 2022-12-01 07:55:51 -05:00
Brad King 5a415b492b Merge topic 'ci-os-arch' 
c212c7dc8b gitlab-ci: drop unnecessary linux kernel version tag
33fe37a660 gitlab-ci: replace '{macos,windows}' tags with '{macos,windows}-x86_64'
94d82d91d5 gitlab-ci: replace 'linux' tags with 'linux-x86_64'
e8c6e06815 gitlab-ci: rename tag configuration entries to start in '$os_$arch_tags'
ebbc3a8171 gitlab-ci: remove unnecessary component of configuration entry names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7973
 2022-12-01 07:53:18 -05:00
Kitware Robot e8faf52223 CMake Nightly Date Stamp 2022-12-01 00:01:09 -05:00
jbs ef9ce3aadb OpenWatcom: Add support for 16-bit Windows 
Add support for NE Win16 binaries.  We already support 16-bit DOS and OS/2.
 2022-11-30 18:22:48 -05:00
Robert Maynard 9d012b1f69 FindCUDAToolkit: Ensure that paths provided have no symlinks 
Fixes: #24188
 2022-11-30 16:39:00 -05:00
Brad King c212c7dc8b gitlab-ci: drop unnecessary linux kernel version tag 
All our CI hosts now have Linux kernel version 3.17 or higher,
so we no longer need a dedicated tag.
 2022-11-30 13:11:11 -05:00
Brad King 33fe37a660 gitlab-ci: replace '{macos,windows}' tags with '{macos,windows}-x86_64' 
The latter tags are now available on our CI runners to more explicitly
distinguish `{macos,windows}-x86_64` from `{macos,windows}-arm64`.
 2022-11-30 11:32:31 -05:00
Brad King 94d82d91d5 gitlab-ci: replace 'linux' tags with 'linux-x86_64' 
The latter tag is now available on our CI runners to more explicitly
distinguish `linux-x86_64` from `linux-aarch64`.
 2022-11-30 11:32:10 -05:00
Brad King e8c6e06815 gitlab-ci: rename tag configuration entries to start in '$os_$arch_tags' 
This groups their definitions nicely, and makes their purpose more
clear from reference sites.
 2022-11-30 11:27:56 -05:00
Brad King ebbc3a8171 gitlab-ci: remove unnecessary component of configuration entry names 
The '_builder' part of tag entry names is not useful with our current
naming conventions.
 2022-11-30 11:27:35 -05:00
Ben Boeckel f4a17b29d3 cmDyndepCollation: factor out metadata writing for dyndep 2022-11-30 10:53:45 -05:00
Ben Boeckel 2f93a272d0 cmDyndepCollation: factor out parsing dyndep information 2022-11-30 10:53:45 -05:00
Ben Boeckel 3fc2de5c74 cmDyndepCollation: factor out writing C++ module info from Ninja 
To facilitate other generators being able to build C++20 modules, start
pulling out collator logic into a generator-agnostic location.

This commit starts by factoring out the information written to the
"target depend info" object consumed during the build to handle writing
out export and installation scripts expected during those steps.
 2022-11-30 10:53:45 -05:00
Brad King 4f905d26bc Merge branch 'release-3.25' 2022-11-30 09:59:07 -05:00
Brad King aa6b57c262 Merge branch 'release-3.24' 2022-11-30 09:59:05 -05:00