mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-20 21:28:23 -05:00
Code Issues Packages Projects Releases Wiki Activity
66,570 Commits 2 Branches 399 Tags
9ee9571b2e209fc507bcdcba06cd04db06da17a7
Commit Graph

66570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 9ee9571b2e Merge topic 'vs-framework-references' 
0721f9bf0f VS: Add VS_FRAMEWORK_REFERENCES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9626
 2024-06-27 11:22:43 -04:00
Brad King e053d6f81b Merge topic 'orkun_26059_24_06_2024' 
8d99e71b7e Autogen: Add timestamp file for CMAKE_GLOBAL_AUTORCC_TARGET
003830f14f Autogen: Remove redundant push_back

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9628
 2024-06-27 11:20:49 -04:00
Brad King 764c8c9036 Merge topic 'test-autogen-nmc' 
8a68ad5233 Autogen: Filter out QtDeployTargets from Ninja Multi-Config tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9627
 2024-06-27 11:11:05 -04:00
Brad King 6935ff7df0 Merge topic 'FindImageMagick-repeat' 
63bb3fca54 FindImageMagick: Allow including multiple times

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9617
 2024-06-27 11:09:48 -04:00
Brad King 006e527987 Merge branch 'release-3.30' 2024-06-27 11:08:08 -04:00
Brad King d64e249ced Merge topic 'fix-doc-manual-cmake-cxxmodules' 
727d25152b Help: Fix typo in cmake-cxxmodules(7) note syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9625
 2024-06-27 11:08:08 -04:00
Brad King 9f1fd88e44 Merge topic 'fix-doc-manual-cmake-cxxmodules' into release-3.30 
727d25152b Help: Fix typo in cmake-cxxmodules(7) note syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9625
 2024-06-27 11:08:06 -04:00
Kitware Robot 38884c1908 CMake Nightly Date Stamp 2024-06-27 00:01:23 -04:00
Calum Robinson 0721f9bf0f VS: Add VS_FRAMEWORK_REFERENCES 
Fixes: #26082
 2024-06-26 16:44:51 +01:00
Orkun Tokdemir 8d99e71b7e Autogen: Add timestamp file for CMAKE_GLOBAL_AUTORCC_TARGET 
When `CMAKE_GLOBAL_AUTORCC_TARGET` is ON and qrc files are not
generated, `<target_name>_arcc_data` is always dirty. So this commit
adds a timestamp file which depens on what `<target_name>_arcc_data`
depends before and ``<target_name>_arcc_data` depends the timestamp
file.

The dependency graph before
(qrcFile, InfoFile) -> _arcc_target

The dependency graph after
(qrcFile, InfoFile) -> global_rcc_timestamp ->_arcc_target

Fixes: #26059
 2024-06-26 15:37:41 +02:00
Orkun Tokdemir 003830f14f Autogen: Remove redundant push_back 2024-06-26 15:33:19 +02:00
權少 727d25152b Help: Fix typo in cmake-cxxmodules(7) note syntax 
Fix a typo from commit 5bbd2c12db (Help/cmake-cxxmodules: describe the
compilation strategy, 2024-03-26, v3.30.0-rc1~251^2~22).
 2024-06-26 09:06:17 -04:00
Josiah VanderZee 63bb3fca54 FindImageMagick: Allow including multiple times 
This prevents attempting to create a duplicate target by adding an
`if(NOT TARGET ...)` check as in other modules.  The condition was
missed in commit 1bba218214 (FindImageMagick: Define targets for
specific components, 2023-01-20, v3.26.0-rc1~23^2).

Fixes: #25970
 2024-06-26 08:50:21 -04:00
Brad King 033713530a Merge topic 'file-rpath-elf-static' 
02f3e5be6a file(RPATH_CHANGE ...): no-op for static binary
ccbbf64552 Tests/RunCMake/file-RPATH: Prepare to cover statically linked binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9623
 2024-06-26 08:46:21 -04:00
Brad King f879d3a33f Merge topic 'preset-comments' 
7d2cc6ece6 presets: Allow comments in presets files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9608
 2024-06-26 08:45:17 -04:00
Brad King a20377e41a Merge topic 'cpack-debian-multiarch' 
71c631c435 CPack/DEB: Add Multi-Arch support
55524c48a4 CPack/DEB: Add Multi-Arch support
a022705a2e Tests/RunCMake/CPack: Improve README

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9609
 2024-06-26 08:44:02 -04:00
Brad King 0ffdd6b50f Merge topic 'orkun_refactor_autogen_tests_21_06_2024' 
6ee5c431d5 Autogen: Separate RunCMake.AutogenQtX tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !9620
 2024-06-26 08:41:02 -04:00
Brad King 1736e37740 Merge topic 'issue-26041-filemakedirectory-result-optional-argument' 
95323c90a1 file(MAKE_DIRECTORY): Add optional RESULT keyword to capture failure.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9604
 2024-06-26 08:39:31 -04:00
Brad King ad6d51c677 Merge branch 'release-3.30' 2024-06-26 08:37:41 -04:00
Brad King 583abd88ed Merge topic 'ci-cmake-update' 
bd84ed18a7 ci: Update CMake version to 3.30.0-rc4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9624
 2024-06-26 08:37:41 -04:00
Brad King 6241e47184 Merge topic 'ci-cmake-update' into release-3.30 
bd84ed18a7 ci: Update CMake version to 3.30.0-rc4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9624
 2024-06-26 08:37:40 -04:00
Orkun Tokdemir 8a68ad5233 Autogen: Filter out QtDeployTargets from Ninja Multi-Config tests 
Since https://codereview.qt-project.org/c/qt/qtbase/+/518683 adds
generation of `.qt/QtDeployTargets-$<CONFIG>.cmake`, those files should
be filtered out from the `Ninja Multi-Config` tests.
 2024-06-26 14:04:46 +02:00
Kitware Robot 812b0be621 CMake Nightly Date Stamp 2024-06-26 00:01:23 -04:00
Kitware Robot 1b8565c0b6 CMake Nightly Date Stamp 2024-06-25 00:01:16 -04:00
Aliaksandr Averchanka 7d2cc6ece6 presets: Allow comments in presets files 
Co-authored-by: Kanaiym <abdigak@clarkson.edu>
Fixes: #22791
 2024-06-24 15:42:46 -04:00
Brad King bd84ed18a7 ci: Update CMake version to 3.30.0-rc4 2024-06-24 14:30:04 -04:00
Harmen Stoppels 02f3e5be6a file(RPATH_CHANGE ...): no-op for static binary 
Setting `CMAKE_INSTALL_RPATH` on a project that contains statically
linked executables breaks the install step, since rpaths cannot be
changed.

This commit makes rpath adjustments not an error on static libraries.

Fixes #26078
 2024-06-24 11:32:30 -04:00
Harmen Stoppels ccbbf64552 Tests/RunCMake/file-RPATH: Prepare to cover statically linked binaries 2024-06-24 11:32:20 -04:00
Brad King acf0024d13 Merge branch 'release-3.30' 2024-06-24 11:09:38 -04:00
Brad King 5fa7ef4e44 CMake 3.30.0-rc4 v3.30.0-rc4 2024-06-24 10:31:45 -04:00
Brad King 66b5b5e326 Merge branch 'release-3.30' 2024-06-24 10:25:43 -04:00
Brad King 4b874546fc Merge topic 'emacs-bracket-syntax-fix' 
3ecf6bd1b1 cmake-mode.el: fix bracket string/comment syntax-propertize

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9621
 2024-06-24 10:25:43 -04:00
Brad King 30d8ead3cb Merge topic 'emacs-bracket-syntax-fix' into release-3.30 
3ecf6bd1b1 cmake-mode.el: fix bracket string/comment syntax-propertize

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9621
 2024-06-24 10:25:42 -04:00
Brad King 31d9606476 Merge branch 'release-3.30' 2024-06-24 10:24:13 -04:00
Brad King 8bca80ad55 Merge branch 'release-3.29' 2024-06-24 10:24:10 -04:00
Brad King f9393aaeba Merge branch 'release-3.29' into release-3.30 2024-06-24 10:24:02 -04:00
Brad King 2cd5999873 Merge branch 'release-3.30' 2024-06-24 10:19:44 -04:00
Brad King 4f8d39cb59 Merge topic 'vs-17.11' 
dfe0f3f358 VS: Fix '-T version=14.4x' under VS 17.1x

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9622
 2024-06-24 10:19:44 -04:00
Brad King 8a5583e37f Merge topic 'vs-17.11' into release-3.30 
dfe0f3f358 VS: Fix '-T version=14.4x' under VS 17.1x

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9622
 2024-06-24 10:19:43 -04:00
eutro 3ecf6bd1b1 cmake-mode.el: fix bracket string/comment syntax-propertize 
With `lexical-binding: t`, the `end` variable is undefined in
`cmake--syntax-propertize-until-bracket-close`, causing syntax
highlighting errors. This fixes that by passing `end` from the caller.
 2024-06-24 09:51:05 -04:00
Brad King be53dcdda6 Merge topic 'vs-17.11' into release-3.29 
dfe0f3f358 VS: Fix '-T version=14.4x' under VS 17.1x

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9622
 2024-06-24 09:43:02 -04:00
Brad King faa61bc634 Merge branch 'release-3.30' 2024-06-24 09:40:56 -04:00
Brad King 72e1dbf45f Merge branch 'release-3.29' 2024-06-24 09:40:54 -04:00
Brad King b14218c9f6 Merge branch 'release-3.29' into release-3.30 2024-06-24 09:40:46 -04:00
Brad King 9b048f31af Merge branch 'release-3.30' 2024-06-24 09:38:43 -04:00
Brad King 0c62599805 Merge topic 'libuv-macos-kqueue' 
422c1de564 libuv: macos: restore use of kqueue instead of posix poll
7e3519e705 libuv: macos: reap child processes more reliably when using kqueue

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9619
 2024-06-24 09:38:43 -04:00
Brad King d1c614d87e Merge topic 'libuv-macos-kqueue' into release-3.30 
422c1de564 libuv: macos: restore use of kqueue instead of posix poll
7e3519e705 libuv: macos: reap child processes more reliably when using kqueue

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9619
 2024-06-24 09:38:41 -04:00
Brad King 1deb543089 Merge topic 'libuv-macos-kqueue' into release-3.29 
422c1de564 libuv: macos: restore use of kqueue instead of posix poll
7e3519e705 libuv: macos: reap child processes more reliably when using kqueue

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9619
 2024-06-24 09:37:18 -04:00
Brad King 1c4c5ad545 Merge topic 'ctest-windows-std-handles' into release-3.29 
e4d0169107 ctest: Fix spurious build failures with CTEST_USE_LAUNCHERS on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9598
 2024-06-24 09:36:19 -04:00
Brad King 05b4883bfe Merge topic 'find_library-per-arch-lib-with-sysroot' 
e74fba3d9c find_library: Search per-arch lib directories when compiling with sysroot

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9614
 2024-06-24 09:29:52 -04:00