summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2024-06-281-1/+1
|
* Merge topic 'vs-framework-references'Brad King2024-06-279-0/+69
|\ | | | | | | | | | | | | 0721f9bf0f VS: Add VS_FRAMEWORK_REFERENCES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9626
| * VS: Add VS_FRAMEWORK_REFERENCESCalum Robinson2024-06-269-0/+69
| | | | | | | | Fixes: #26082
* | Merge topic 'orkun_26059_24_06_2024'Brad King2024-06-272-12/+55
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Autogen: Add timestamp file for CMAKE_GLOBAL_AUTORCC_TARGETOrkun Tokdemir2024-06-262-7/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Autogen: Remove redundant push_backOrkun Tokdemir2024-06-261-5/+2
| | |
* | | Merge topic 'test-autogen-nmc'Brad King2024-06-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Autogen: Filter out QtDeployTargets from Ninja Multi-Config testsOrkun Tokdemir2024-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'FindImageMagick-repeat'Brad King2024-06-271-5/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63bb3fca54 FindImageMagick: Allow including multiple times Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: scivision <michael@scivision.dev> Merge-request: !9617
| * | | | FindImageMagick: Allow including multiple timesJosiah VanderZee2024-06-261-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch 'release-3.30'Brad King2024-06-270-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'fix-doc-manual-cmake-cxxmodules' into release-3.30Brad King2024-06-271-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ Merge topic 'fix-doc-manual-cmake-cxxmodules'Brad King2024-06-271-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Help: Fix typo in cmake-cxxmodules(7) note syntax權少2024-06-261-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo from commit 5bbd2c12db (Help/cmake-cxxmodules: describe the compilation strategy, 2024-03-26, v3.30.0-rc1~251^2~22).
* | | | | | CMake Nightly Date StampKitware Robot2024-06-271-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'file-rpath-elf-static'Brad King2024-06-267-8/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | file(RPATH_CHANGE ...): no-op for static binaryHarmen Stoppels2024-06-245-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Tests/RunCMake/file-RPATH: Prepare to cover statically linked binariesHarmen Stoppels2024-06-243-7/+16
| | | | | |
* | | | | | Merge topic 'preset-comments'Brad King2024-06-2621-375/+1716
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d2cc6ece6 presets: Allow comments in presets files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9608
| * | | | | | presets: Allow comments in presets filesAliaksandr Averchanka2024-06-2421-375/+1716
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Kanaiym <abdigak@clarkson.edu> Fixes: #22791
* | | | | | | Merge topic 'cpack-debian-multiarch'Brad King2024-06-2611-5/+71
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | CPack/DEB: Add Multi-Arch supportRobert Schuster2024-06-244-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix tests Fixes: #21445
| * | | | | | | CPack/DEB: Add Multi-Arch supportRobert Schuster2024-06-216-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Multi-Arch in control files of Debian packages. Valid values: same, foreign, allowed Fixes: #21445
| * | | | | | | Tests/RunCMake/CPack: Improve READMERobert Schuster2024-06-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hints for newbies. Fix typos.
* | | | | | | | Merge topic 'orkun_refactor_autogen_tests_21_06_2024'Brad King2024-06-2669-518/+570
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Autogen: Separate RunCMake.AutogenQtX testsOrkun Tokdemir2024-06-2469-518/+570
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RunCMake.AutogenQtX tests occasionally time out so separate `RunCMake.AutogenQtX` tests. Example: https://open.cdash.org/tests/1583599782
* | | | | | | | Merge topic 'issue-26041-filemakedirectory-result-optional-argument'Brad King2024-06-2619-21/+124
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | file(MAKE_DIRECTORY): Add optional RESULT keyword to capture failure.Asit Dhal2024-06-2419-21/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #26041
* | | | | | | | | Merge branch 'release-3.30'Brad King2024-06-260-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge topic 'ci-cmake-update' into release-3.30Brad King2024-06-262-7/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ \ \ \ Merge topic 'ci-cmake-update'Brad King2024-06-262-7/+7
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | ci: Update CMake version to 3.30.0-rc4Brad King2024-06-242-7/+7
| |/ / / / / / /
* | | | | | | | CMake Nightly Date StampKitware Robot2024-06-261-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2024-06-251-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.30'Brad King2024-06-240-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | CMake 3.30.0-rc4v3.30.0-rc4Brad King2024-06-241-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.30'Brad King2024-06-240-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge topic 'emacs-bracket-syntax-fix' into release-3.30Brad King2024-06-241-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ecf6bd1b1 cmake-mode.el: fix bracket string/comment syntax-propertize Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9621
* | \ \ \ \ \ Merge topic 'emacs-bracket-syntax-fix'Brad King2024-06-241-3/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ecf6bd1b1 cmake-mode.el: fix bracket string/comment syntax-propertize Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9621
| * | | | | | cmake-mode.el: fix bracket string/comment syntax-propertizeeutro2024-06-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge branch 'release-3.30'Brad King2024-06-240-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'release-3.29' into release-3.30Brad King2024-06-240-0/+0
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'release-3.29'Brad King2024-06-240-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'vs-17.11' into release-3.29Brad King2024-06-241-4/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dfe0f3f358 VS: Fix '-T version=14.4x' under VS 17.1x Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9622
* | \ \ \ \ \ \ \ Merge branch 'release-3.30'Brad King2024-06-240-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'vs-17.11' into release-3.30Brad King2024-06-241-4/+2
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | dfe0f3f358 VS: Fix '-T version=14.4x' under VS 17.1x Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9622
* | | | | | | | Merge topic 'vs-17.11'Brad King2024-06-241-4/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dfe0f3f358 VS: Fix '-T version=14.4x' under VS 17.1x Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9622
| * | | | | | | VS: Fix '-T version=14.4x' under VS 17.1xBrad King2024-06-241-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with VS 17.10 the v143 toolset reserves versions `14.30` through `14.49`. This is the first time that the first three digits of the version do not match the toolset name. Extend the special case from commit d256581bb0 (VS: Fix '-T version=14.40' under VS 17.10 preview 1, 2024-02-19, v3.29.0-rc2~10^2) to cover the entire reserved version range.
* | | | | | | | Merge branch 'release-3.30'Brad King2024-06-240-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'release-3.29' into release-3.30Brad King2024-06-240-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
generated by cgit v0.12 at 2025-08-28 20:37:39 (GMT)