mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-26 10:48:38 -06:00
Code Issues Packages Projects Releases Wiki Activity
61,235 Commits 2 Branches 391 Tags
697ca5d51cb357643c121a0edde81999a9390b96
Commit Graph

61235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
697ca5d51c Merge topic 'ExternalProject-revert-install' 
771387523a ExternalProject: Restore driving install through build system

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8279
 2023-03-03 09:22:46 -05:00
Brad King
a5b0056d1a Merge branch 'release-3.26' 2023-03-03 09:21:17 -05:00
Brad King
1150418769 Merge topic 'doc-block' 
2931f078dc Help:cmake-language: note new block() command scope

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8276
 2023-03-03 09:21:17 -05:00
Brad King
cbaf334598 Merge topic 'doc-block' into release-3.26 
2931f078dc Help:cmake-language: note new block() command scope

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8276
 2023-03-03 09:21:16 -05:00
Brad King
87330a10e2 Merge topic 'ninja-multi-output-path-prefix' 
df38eaab2c Ninja Multi-Config: Write output path prefix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8280
 2023-03-03 09:18:34 -05:00
Brad King
10f318326f Merge topic 'doc-IMPORTED_CONFIGURATIONS' 
8adcb73956 Help:IMPORTED_CONFIGURATIONS: Mention relation to IMPORTED_LOCATION
e1032a22eb Help:IMPORTED_IMPLIB: Mention IMPORTED_IMPLIB_<CONFIG> variant

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8281
 2023-03-03 09:10:54 -05:00
Kitware Robot
c465e0e3bb CMake Nightly Date Stamp 2023-03-03 00:01:12 -05:00
Kyle Edwards
def618f1ae Merge topic 'TargetRunTimeDllDirs' 
a2c9c4f202 Add test for the new TARGET_RUNTIME_DLL_PATHS genex
aa68de0a27 TARGET_RUNTIME_DLLS: minor refactoring of shared-check.cmake
2ce3d62ffb Help: add documentation for the new TARGET_RUNTIME_DLL_DIRS genex
c351dcd967 TARGET_RUNTIME_DLL_DIRS: add the new genex to cmGeneratorExpressionNode
064c3244da TARGET_RUNTIME_DLLS: fix test for this genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !8247
 2023-03-02 16:28:30 -05:00
Brad King
8adcb73956 Help:IMPORTED_CONFIGURATIONS: Mention relation to IMPORTED_LOCATION 2023-03-02 15:25:32 -05:00
Brad King
e1032a22eb Help:IMPORTED_IMPLIB: Mention IMPORTED_IMPLIB_<CONFIG> variant 
This is already done in `IMPORTED_LOCATION` documentation.
 2023-03-02 15:25:00 -05:00
Kyle Edwards
df38eaab2c Ninja Multi-Config: Write output path prefix 
Fixes: #24566
 2023-03-02 15:10:53 -05:00
Brad King
771387523a ExternalProject: Restore driving install through build system 
Revert commit 66b5d51f38 (ExternalProject: Install CMake projects
using 'cmake --install', 2022-09-08, v3.25.0-rc1~150^2).
It changed the ExternalProject install step command from:

    cmake --build <dir> --target install --config <cfg>

to:

    cmake --install <dir> --config <cfg>

The latter command no longer runs the external project build system
during the install step.  We could consider using the commands:

    cmake --build <dir> --target all --config <cfg>
    cmake --install <dir> --config <cfg>

as the install step, but if `CMAKE_SKIP_INSTALL_ALL_DEPENDENCY` is
used in the external project, that can change semantics too.

Revert the original change pending further investigation on other ways
to support its motivating use case.  Add a test covering the
previously-regressed use case.

Fixes: #24567
Issue: #23946
 2023-03-02 14:28:26 -05:00
scivision
2931f078dc Help:cmake-language: note new block() command scope 2023-03-02 10:34:56 -05:00
Brad King
9f309e655f Merge topic 'test-minver' 
f53bd6f450 Tests: Bump CMake minimum required in tests to 3.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8274
 2023-03-02 10:13:08 -05:00
Brad King
5fe186ade7 Merge topic 'target_sources-backtrace' 
b909be9e23 target_sources: Fix backtrace on missing source
4a3e79048b Tests: Add RunCMake.target_sources case covering missing source

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8268
 2023-03-02 10:07:31 -05:00
Brad King
3c7e486785 Merge topic 'retry-file-download-on-timeout' 
296d2bef06 ExternalProject: Also retry curl download on timeout error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8270
 2023-03-02 10:01:43 -05:00
Brad King
48c2a146ae Merge topic 'clean-AddCacheEntry' 
87c4eba5cb cmState::AddCacheEntry(): Remove unused overloads

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8269
 2023-03-02 09:54:59 -05:00
Brad King
f9888e5f51 Merge topic 'dont_use_bom_with_cuda' 
c5305cf493 Makefile: Don't pass the CUDA compiler response files with UTF8_BOM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ivan Katalenić <ivankatalenic100@gmail.com>
Merge-request: !8267
 2023-03-02 09:54:03 -05:00
Brad King
1d7fb31778 Merge topic 'Apple-handle-Text-Stubs' 
ede33f30cf Apple: Handle generation and comsuption of text-based stubs (.tbd files)
fcbd723a50 Enhance support functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !8204
 2023-03-02 09:53:03 -05:00
Kitware Robot
b32949d47e CMake Nightly Date Stamp 2023-03-02 00:01:14 -05:00
Brad King
f53bd6f450 Tests: Bump CMake minimum required in tests to 3.5 
CMake 3.27 deprecates compatibility with CMake < 3.5.  Update tests that
do not cover older interfaces to avoid the deprecation warning.

Follow the pattern from:

* commit 7b07ccdd2b (Tests/*Only: Update cmake_minimum_required versions,
                     2020-06-15, v3.19.0-rc1~629^2~1)

* commit 72e7c45e98 (Tests: Bump CMake minimum required in tests to 2.8.12,
                     2020-12-22, v3.20.0-rc1~224^2)

* commit f6b4db365a (Tests: bump cmake_minimum_required version to 2.8.12,
                     2021-04-04, v3.21.0-rc1~372^2)

Also remove explicit `cmake_policy` settings made redundant by the
version.
 2023-03-01 16:36:54 -05:00
Brad King
7b37ebe835 Merge branch 'release-3.26' 2023-03-01 10:43:40 -05:00
Brad King
6c0b3d2b7e CMake 3.26.0-rc5 v3.26.0-rc5 2023-03-01 09:43:05 -05:00
Brad King
d8af11805a Merge branch 'release-3.26' 2023-03-01 09:36:36 -05:00
Brad King
532ca3e7c7 Merge topic 'check-curses-min-cmake' 
d70582eed8 ccmake: Update minimum required version of CMake for curses check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8272
 2023-03-01 09:36:36 -05:00
Brad King
fd05b428eb Merge topic 'check-curses-min-cmake' into release-3.26 
d70582eed8 ccmake: Update minimum required version of CMake for curses check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8272
 2023-03-01 09:36:35 -05:00
Brad King
239ef6f108 Merge branch 'release-3.26' 2023-03-01 09:35:43 -05:00
Brad King
d7df908fc5 Merge topic 'FindPython-fix-CMAKE_SHARED_LIBRARY_SUFFIX-matching' 
764441e672 FindPython: fix erroneous ${CMAKE_SHARED_LIBRARY_SUFFIX} matching

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8271
 2023-03-01 09:35:42 -05:00
Brad King
e903268d67 Merge topic 'FindPython-fix-CMAKE_SHARED_LIBRARY_SUFFIX-matching' into release-3.26 
764441e672 FindPython: fix erroneous ${CMAKE_SHARED_LIBRARY_SUFFIX} matching

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8271
 2023-03-01 09:35:41 -05:00
Greg Thain
296d2bef06 ExternalProject: Also retry curl download on timeout error 
Since commit f24e34975a (ExternalProject: retry download on recoverable
errors, 2020-08-08, v3.19.0-rc1~298^2~1) ExternalProject has a list of
curl errors which trigger a retry today: 6, 7, 8 and 15.

Add curl error 28.  It is a "timeout error", and should also trigger a
retry attempt at a download of an external project.  The complete list
of curl errors is https://curl.se/libcurl/c/libcurl-errors.html
 2023-03-01 09:31:04 -05:00
Brad King
882abea3d8 Merge topic 'FindVulkan-mingw-cross-compiling' 
829f1b5be4 FindVulkan: Add more search paths for MINGW when cross compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8256
 2023-03-01 09:22:53 -05:00
Brad King
a6b4bbfa57 Merge topic 'csharp_sdk_win32_exe' 
0dff040f10 VS : Support WIN32_EXECUTABLE on SDK style projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sumit Bhardwaj <bhardwajs@outlook.com>
Merge-request: !8263
 2023-03-01 09:22:05 -05:00
Brad King
0c30af2753 Merge topic 'remove-dart-modules' 
2e469212c8 Dart,FindDart: Add policy to remove these modules
6dd2948b4b Tests: Port "testing" test from Dart module to CTest module
1f5ff4d131 Merge branch 'upstream-KWSys' into remove-dart-modules
ec3652a0bd KWSys 2023-02-28 (68534a6a)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8265
 2023-03-01 09:21:03 -05:00
Brad King
d70582eed8 ccmake: Update minimum required version of CMake for curses check 
This should have been part of commit d6b811fb82 (Require CMake 3.13+ to
configure CMake itself, 2022-02-22, v3.24.0-rc1~605^2~1).
 2023-03-01 09:15:38 -05:00
Brad King
446e89b28b Merge branch 'release-3.26' 2023-03-01 09:12:53 -05:00
Brad King
1c1f67a77e Merge topic 'ci-package-pipeline' 
7c60a2625d gitlab-ci: Optionally upload release packages to custom URL
fc8a981893 gitlab-ci: Generalize package and help upload URLs
f73649823b gitlab-ci: Stage unsigned release package artifacts in a dedicated directory
0929221ca3 gitlab-ci: Simplify Windows packaging pipeline
ce2e825306 gitlab-ci: Simplify macOS packaging jobs
05531a7c4e gitlab-ci: add pre-build and post-build steps to Windows
5ab92d8e71 gitlab-ci: add pre-build and post-build steps to macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8266
 2023-03-01 09:12:53 -05:00
Brad King
43fd7f6adb Merge topic 'ci-package-pipeline' into release-3.26 
7c60a2625d gitlab-ci: Optionally upload release packages to custom URL
fc8a981893 gitlab-ci: Generalize package and help upload URLs
f73649823b gitlab-ci: Stage unsigned release package artifacts in a dedicated directory
0929221ca3 gitlab-ci: Simplify Windows packaging pipeline
ce2e825306 gitlab-ci: Simplify macOS packaging jobs
05531a7c4e gitlab-ci: add pre-build and post-build steps to Windows
5ab92d8e71 gitlab-ci: add pre-build and post-build steps to macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8266
 2023-03-01 09:12:52 -05:00
Brad King
299c37a21d Merge branch 'release-3.26' 2023-03-01 09:11:55 -05:00
Brad King
5691e7e900 Merge topic 'try-doc' 
b6cfbe7b17 Help:try_{compile,run}: clarify, encourage new syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8262
 2023-03-01 09:11:55 -05:00
Brad King
a5cf009c2a Merge topic 'try-doc' into release-3.26 
b6cfbe7b17 Help:try_{compile,run}: clarify, encourage new syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8262
 2023-03-01 09:11:54 -05:00
Marc Chevrier
764441e672 FindPython: fix erroneous ${CMAKE_SHARED_LIBRARY_SUFFIX} matching 
Fixes: #24556
 2023-03-01 12:34:13 +01:00
Marc Chevrier
ede33f30cf Apple: Handle generation and comsuption of text-based stubs (.tbd files) 
Fixes: #24123
 2023-03-01 12:23:28 +01:00
Kitware Robot
8807292ef4 CMake Nightly Date Stamp 2023-03-01 00:01:15 -05:00
Vitaly Stakhovsky
87c4eba5cb cmState::AddCacheEntry(): Remove unused overloads 2023-02-28 19:44:42 -05:00
Brad King
b909be9e23 target_sources: Fix backtrace on missing source 
If a source file is not found, the error message reports a backtrace.
Previously the backtrace pointed at where the target was created.
In the case of `target_sources`, the missing source may have been
named elsewhere.

Fixes: #24538
 2023-02-28 18:07:36 -05:00
Brad King
4a3e79048b Tests: Add RunCMake.target_sources case covering missing source 2023-02-28 17:50:31 -05:00
Robert Maynard
c5305cf493 Makefile: Don't pass the CUDA compiler response files with UTF8_BOM 
Fixes #24544
 2023-02-28 15:39:55 -05:00
Brad King
7c60a2625d gitlab-ci: Optionally upload release packages to custom URL 2023-02-28 13:39:52 -05:00
Brad King
fc8a981893 gitlab-ci: Generalize package and help upload URLs 2023-02-28 13:39:52 -05:00
Brad King
f73649823b gitlab-ci: Stage unsigned release package artifacts in a dedicated directory 
These artifacts need to be manually signed before distribution.
Move them to a dedicated `unsigned/` directory to avoid accidental
distribution without signing.
 2023-02-28 13:39:52 -05:00