mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 14:19:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
63,739 Commits 2 Branches 401 Tags
dea37a4e7df2d433c90d78a5df303f94eeda9e0f
Commit Graph

63739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King dea37a4e7d Merge branch 'release-3.28' 2023-11-06 12:18:51 -05:00
Brad King ed154b3896 CMake 3.28.0-rc4 v3.28.0-rc4 2023-11-06 11:50:13 -05:00
Brad King 530deed998 Merge topic 'cmake-E-cat-stdin' 
ab72846794 cmake -E cat: Add ability to print standard input

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8942
 2023-11-06 10:35:45 -05:00
Kitware Robot a3e67a60de CMake Nightly Date Stamp 2023-11-06 00:01:38 -05:00
Craig Scott 768690ee9a Merge topic 'FetchContent-GHS' 
6a81104413 FetchContent: Pass GHS Variables to subbuild

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8930
 2023-11-05 18:47:52 -05:00
Kitware Robot 51d985da3e CMake Nightly Date Stamp 2023-11-05 00:01:07 -04:00
William Sciaroni 6a81104413 FetchContent: Pass GHS Variables to subbuild 
Fixes: #24244
 2023-11-05 08:42:27 +11:00
Kitware Robot 3a467f0f8e CMake Nightly Date Stamp 2023-11-04 00:01:08 -04:00
Brad King 8a7500a438 Merge topic 'CMakeFindPackageMode-link-docs' 
c5388bd320 CMakeFindPackageMode: Link to cmake --find-package documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8943
 2023-11-03 10:52:53 -04:00
Brad King d11757fb33 Merge branch 'release-3.28' 2023-11-03 10:38:49 -04:00
Brad King e07ad5ee9c Merge topic 'cdash-report-urls' 
06661b1e4c gitlab-ci: pull annotations for CDash from the jobs
a518e402c5 ci: generate annotation reports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8939
 2023-11-03 10:38:48 -04:00
Brad King 1e7489e3ac Merge topic 'cdash-report-urls' into release-3.28 
06661b1e4c gitlab-ci: pull annotations for CDash from the jobs
a518e402c5 ci: generate annotation reports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8939
 2023-11-03 10:38:47 -04:00
Kyle Edwards a7276f3c29 Merge branch 'release-3.28' 2023-11-03 10:28:36 -04:00
Kyle Edwards cee364e77f Merge topic 'cmsystemtools-runsinglecommand-stdin' 
c4be9c914b cmSystemTools::RunSingleCommand(): Pass stdin to child process

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8941
 2023-11-03 10:28:36 -04:00
Kyle Edwards 86ae23b6f3 Merge topic 'cmsystemtools-runsinglecommand-stdin' into release-3.28 
c4be9c914b cmSystemTools::RunSingleCommand(): Pass stdin to child process

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8941
 2023-11-03 10:28:35 -04:00
權少 c5388bd320 CMakeFindPackageMode: Link to cmake --find-package documentation 2023-11-03 10:17:38 -04:00
Kyle Edwards ab72846794 cmake -E cat: Add ability to print standard input 2023-11-03 09:03:25 -04:00
Kitware Robot 6b28b1b933 CMake Nightly Date Stamp 2023-11-03 00:01:09 -04:00
Ben Boeckel 06661b1e4c gitlab-ci: pull annotations for CDash from the jobs 
Only move `cdash-build-id` between stages that make sense.
 2023-11-02 15:24:45 -04:00
Ben Boeckel a518e402c5 ci: generate annotation reports 
These will render links in the sidebar for each job.

See: https://docs.gitlab.com/ee/ci/yaml/artifacts_reports.html#artifactsreportsannotations
 2023-11-02 15:24:45 -04:00
Kyle Edwards c4be9c914b cmSystemTools::RunSingleCommand(): Pass stdin to child process 
Fixes: #25383
 2023-11-02 10:04:00 -04:00
Brad King 1233f2d57a Merge branch 'release-3.28' 2023-11-02 09:35:57 -04:00
Brad King 3a926cba6c Merge topic 'cuda-vs' 
f0feefceb3 Merge branch 'backport-cuda-vs' into cuda-vs
79f3f29e50 CUDA: Parse NVCC implicit compile/link information in Visual Studio generators
27e64a8498 CMakeNVCCParseImplicitInfo: Recognize link.exe line in CUDA VS integration
677992d85a CMakeParseImplicitLinkInfo: Log exclusion of MSVC link /implib: flag
045399a461 CMakeParseImplicitLinkInfo: Ignore MSVC link /implib: flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !8938
 2023-11-02 09:35:57 -04:00
Brad King ae84de5a0c Merge topic 'cuda-vs' into release-3.28 
79f3f29e50 CUDA: Parse NVCC implicit compile/link information in Visual Studio generators
27e64a8498 CMakeNVCCParseImplicitInfo: Recognize link.exe line in CUDA VS integration
045399a461 CMakeParseImplicitLinkInfo: Ignore MSVC link /implib: flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !8938
 2023-11-02 09:35:56 -04:00
Brad King 0f02655bb0 Merge topic 'if-check-file-permissions' 
337bc5662c if(): add operators IS_READABLE, IS_WRITABLE and IS_EXECUTABLE.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8908
 2023-11-02 09:31:01 -04:00
Brad King 83a85264b4 Merge topic 'Genex-LINK_LIBRARY-updates' 
1b8ceaef85 Genex LINK_LIBRARY: fix some definitions for Apple platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8936
 2023-11-02 09:21:10 -04:00
Brad King d63dbb21f0 Merge topic 'findwxwidgets-lexilla' 
90b77e3783 FindwxWidgets: link with lexilla
f8831a0c9e FindwxWidgets: Convert include and library paths to cmake-style
d76242ed9f FindwxWidgets: Prevent searching libraries multiple times
55072adf16 FindwxWidgets: Improve linking with scintilla
c5e3d12213 FindwxWidgets: Move wx-config specific checks inside UNIX find-style
625023cace FindwxWidgets: Include hotfix number
35d90784e9 FindwxWidgets: use IN_LIST

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8927
 2023-11-02 09:19:40 -04:00
Kitware Robot 4d7342512c CMake Nightly Date Stamp 2023-11-02 00:01:06 -04:00
Brad King f0feefceb3 Merge branch 'backport-cuda-vs' into cuda-vs 2023-11-01 13:51:51 -04:00
Brad King 79f3f29e50 CUDA: Parse NVCC implicit compile/link information in Visual Studio generators 
Refactoring in commit deff0e638d (CUDA: Factor out helper to parse NVCC
implicit compiler and linker flags, 2023-09-15, v3.28.0-rc1~63^2~6)
incorrectly dropped detection of the default CUDA architecture and
the CUDA toolkit include directories from the code path used for
Visual Studio generators.  However, CMakeNVCCParseImplicitInfo is
now general enough that we no longer need a VS-specific code path.

Fixes: #25378
 2023-11-01 13:51:21 -04:00
Brad King 27e64a8498 CMakeNVCCParseImplicitInfo: Recognize link.exe line in CUDA VS integration 2023-11-01 13:51:10 -04:00
Brad King 38ddd6c2ef Merge branch 'release-3.28' 2023-11-01 13:48:15 -04:00
Brad King 2e16fca2be Merge topic 'cxxmodules-cmp0155-graceful-fallback-without-scanner' 
1f507580a1 cmGlobalGenerator: give context about module queries
889aa0354a CMP0155: ignore scanning for sources if no scanner is available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8925
 2023-11-01 13:48:15 -04:00
Brad King 59c3ce4c83 Merge topic 'cxxmodules-cmp0155-graceful-fallback-without-scanner' into release-3.28 
1f507580a1 cmGlobalGenerator: give context about module queries
889aa0354a CMP0155: ignore scanning for sources if no scanner is available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8925
 2023-11-01 13:48:14 -04:00
Brad King 677992d85a CMakeParseImplicitLinkInfo: Log exclusion of MSVC link /implib: flag 2023-11-01 13:11:14 -04:00
Brad King 045399a461 CMakeParseImplicitLinkInfo: Ignore MSVC link /implib: flag 
The flag specifies the import library for the linked binary.
It is not a linked library.
 2023-11-01 13:07:43 -04:00
Marc Chevrier 1b8ceaef85 Genex LINK_LIBRARY: fix some definitions for Apple platforms 
Some declarations were inconsistent.
For example, "LINKER:-force_load <LIBRARY>" was translated to
"-Xlinker -force_load /path/to/library". The correct translation
should be "-Xlinker -force_load -Xlinker /path/to/library" because
the library is an argument to the -force_load option.
 2023-11-01 17:11:37 +01:00
Brad King 40df72a64e Merge branch 'release-3.28' 2023-11-01 10:06:59 -04:00
Brad King 0deae254e0 Merge topic 'ctest-windows-color' 
2553a78aa7 ctest: Allow colored output on Windows if CLICOLOR_FORCE is set to 1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8932
 2023-11-01 10:06:59 -04:00
Brad King 8b95e3ff43 Merge topic 'ctest-windows-color' into release-3.28 
2553a78aa7 ctest: Allow colored output on Windows if CLICOLOR_FORCE is set to 1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8932
 2023-11-01 10:06:58 -04:00
Marc Chevrier 337bc5662c if(): add operators IS_READABLE, IS_WRITABLE and IS_EXECUTABLE. 
Offers possibility to check for file or directory permissions.
 2023-11-01 14:53:31 +01:00
Ben Boeckel 1f507580a1 cmGlobalGenerator: give context about module queries 
Some queries are merely investigating support in order to change
behavior. Let the method know so that any internal errors can be skipped
over.
 2023-11-01 09:52:13 -04:00
Ben Boeckel 889aa0354a CMP0155: ignore scanning for sources if no scanner is available 
This allows for a more graceful transition for projects using C++20
without scanner support (e.g., Clang 15 or GCC 13). While newer
compilers will (needlessly) scan, it allows C++20-using projects to use
older compilers without having to set `CMAKE_CXX_SCAN_FOR_MODULES` to
support newer CMake minimum versions.

Fixes: #25357
 2023-11-01 09:52:08 -04:00
Cristian Adam 2553a78aa7 ctest: Allow colored output on Windows if CLICOLOR_FORCE is set to 1 
Windows 10 supports ANSI colors since v1511. For earlier versions of Windows
installing ANSICON will enable ANSI colors in cmd.exe.

For those setups where the environment is set up with CLICOLOR_FORCE set
to 1 ctest should honor the setting and emit colored ANSI output.
 2023-11-01 09:43:59 -04:00
Brad King 0711a81918 Merge branch 'release-3.28' 2023-11-01 09:40:46 -04:00
Brad King d662533189 Merge branch 'release-3.27' 2023-11-01 09:40:45 -04:00
Brad King e416b3122e Merge branch 'release-3.27' into release-3.28 2023-11-01 09:40:31 -04:00
Brad King 5befbdecc2 Merge branch 'release-3.28' 2023-11-01 09:40:01 -04:00
Brad King 0877babe8b Merge topic 'revert-GetPrerequisites-linux-x86' 
139df0bc2f GetPrerequisites: Revert "Ignore relative paths printed by ldd"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8933
 2023-11-01 09:40:01 -04:00
Brad King 3f7419a124 Merge topic 'revert-GetPrerequisites-linux-x86' into release-3.28 
139df0bc2f GetPrerequisites: Revert "Ignore relative paths printed by ldd"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8933
 2023-11-01 09:39:59 -04:00