mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 20:00:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
69,489 Commits 2 Branches 401 Tags
75da788360ca67f752ee70754d310dca52411cf9
Commit Graph

69489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandru Croitor 245f5ca8b3 Tests: Make CMakeGUI test build with both Qt5 and Qt6 
Fixes: #26710
 2025-02-21 14:41:12 -05:00
Brad King 5afbc739dc ci: Specify Qt version separately for each Fedora build 
Currently all builds use Qt 5.  Prepare to switch some to Qt 6.
 2025-02-21 14:41:12 -05:00
Brad King e35d1ee4cd cmake-gui: Clarify variable name for selected Qt major version 2025-02-21 14:41:12 -05:00
Brad King 19a1c115e0 cmake-gui: Fix integer conversion warnings with Qt 6 2025-02-21 14:41:12 -05:00
Brad King cbf0d3da52 cmake-gui: Port away from deprecated API in Qt >= 6.7 2025-02-21 12:39:19 -05:00
Brad King 8b8cf1ac8e Merge topic 'update-jsoncpp' 
af65a5d98b Merge branch 'upstream-jsoncpp' into update-jsoncpp
6a4aca62f6 jsoncpp 2024-09-09 (89e2973c)
3dec83ae8c jsoncpp: Update script to get jsoncpp 1.9.6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10379
 2025-02-21 09:21:31 -05:00
Brad King 6da08ab967 Merge topic 'patch-1' 
b69d64f72b FindwxWidgets: special case -latomic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10377
 2025-02-21 09:16:51 -05:00
Brad King 638b42532c Merge topic 'nsis-uninst-name' 
33e85acff7 CPack/NSIS: Use the installed display name in uninstall prompt

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10368
 2025-02-21 09:14:51 -05:00
Brad King ff579a02e2 Merge branch 'release-4.0' 2025-02-21 09:13:01 -05:00
Brad King f0140a6e72 Merge topic 'policy-version-env' 
33856b1d62 Add CMAKE_POLICY_VERSION_MINIMUM environment variable
04721acc6c Tests: Cover CMAKE_POLICY_VERSION_MINIMUM in initial cache script
729470ff6d Tests: Cover CMAKE_POLICY_VERSION_MINIMUM in script mode
6cd10ffed7 Tests: Cover CMAKE_POLICY_VERSION_MINIMUM as cache entry

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: John Parent <john.parent@kitware.com>
Merge-request: !10376
 2025-02-21 09:13:01 -05:00
Brad King 1d606df7cc Merge topic 'policy-version-env' into release-4.0 
33856b1d62 Add CMAKE_POLICY_VERSION_MINIMUM environment variable
04721acc6c Tests: Cover CMAKE_POLICY_VERSION_MINIMUM in initial cache script
729470ff6d Tests: Cover CMAKE_POLICY_VERSION_MINIMUM in script mode
6cd10ffed7 Tests: Cover CMAKE_POLICY_VERSION_MINIMUM as cache entry

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: John Parent <john.parent@kitware.com>
Merge-request: !10376
 2025-02-21 09:12:59 -05:00
Brad King 1e7be6206b Merge branch 'release-4.0' 2025-02-21 09:09:59 -05:00
Brad King 790954b29d Merge topic 'fix-cps-in-prefix-root' 
da0d2a996d CPS: Fix importing from the prefix root

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10375
 2025-02-21 09:09:59 -05:00
Brad King 0dd8cdc831 Merge topic 'fix-cps-in-prefix-root' into release-4.0 
da0d2a996d CPS: Fix importing from the prefix root

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10375
 2025-02-21 09:09:56 -05:00
Brad King eabc7f6481 Merge branch 'release-4.0' 2025-02-21 09:08:22 -05:00
Brad King 81522be1bb Merge topic 'test-implicit-link-info' 
626d466b12 Tests: Make RunCMake.ParseImplicitLinkInfo robust to on-disk libstdc++.a
bf2067d67b Tests: Fix typos in RunCMake.ParseImplicitLinkInfo sample data

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10378
 2025-02-21 09:08:22 -05:00
Brad King 161d20af84 Merge topic 'test-implicit-link-info' into release-4.0 
626d466b12 Tests: Make RunCMake.ParseImplicitLinkInfo robust to on-disk libstdc++.a
bf2067d67b Tests: Fix typos in RunCMake.ParseImplicitLinkInfo sample data

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10378
 2025-02-21 09:08:20 -05:00
Brad King 1456d0c0f9 Merge branch 'release-4.0' 2025-02-21 09:06:48 -05:00
Brad King 4701678fa1 Merge topic 'doc-add_dependencies' 
77a742b088 Help: add_dependencies requires at least two arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10370
 2025-02-21 09:06:48 -05:00
Brad King 7886374d2b Merge topic 'doc-add_dependencies' into release-4.0 
77a742b088 Help: add_dependencies requires at least two arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10370
 2025-02-21 09:06:46 -05:00
Brad King 9a5d968484 Merge branch 'release-4.0' 2025-02-21 09:04:52 -05:00
Brad King cbfe6947e6 Merge topic 'rel-src-cleanup' 
57a24181ed clang-tidy: Do not require config file if not running clang-tidy
aa42ba1ac8 gitattributes: Do not export pre-commit config file in source archives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10371
 2025-02-21 09:04:52 -05:00
Brad King a96a80ca09 Merge topic 'rel-src-cleanup' into release-4.0 
57a24181ed clang-tidy: Do not require config file if not running clang-tidy
aa42ba1ac8 gitattributes: Do not export pre-commit config file in source archives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10371
 2025-02-21 09:04:50 -05:00
Kitware Robot d89c4cd3fb CMake Nightly Date Stamp 2025-02-21 00:06:46 -05:00
Brad King af65a5d98b Merge branch 'upstream-jsoncpp' into update-jsoncpp 
* upstream-jsoncpp:
  jsoncpp 2024-09-09 (89e2973c)
 2025-02-20 19:07:15 -05:00
JsonCpp Upstream 6a4aca62f6 jsoncpp 2024-09-09 (89e2973c) 
Code extracted from:

    https://github.com/open-source-parsers/jsoncpp.git

at commit 89e2973c754a9c02a49974d839779b151e95afd6 (1.9.6).
 2025-02-20 19:04:48 -05:00
Brad King 3dec83ae8c jsoncpp: Update script to get jsoncpp 1.9.6 2025-02-20 19:04:28 -05:00
Brad King 626d466b12 Tests: Make RunCMake.ParseImplicitLinkInfo robust to on-disk libstdc++.a 
Extend commit 1d7fddca8e (CMakeParseImplicitLinkInfo: Honor GNU static
runtime library flags, 2021-06-02, v3.21.0-rc1~85^2) to cover Cray 8.7
sample data.
 2025-02-20 18:50:34 -05:00
Brad King bf2067d67b Tests: Fix typos in RunCMake.ParseImplicitLinkInfo sample data 2025-02-20 18:50:16 -05:00
Osyotr b69d64f72b FindwxWidgets: special case -latomic 
Fixes: #26718
 2025-02-20 17:23:25 -05:00
Brad King 33856b1d62 Add CMAKE_POLICY_VERSION_MINIMUM environment variable 
Extend commit 1a35351125 (Add CMAKE_POLICY_VERSION_MINIMUM to help
configure outdated projects, 2025-02-13, v4.0.0-rc1~12^2) with an
environment variable to initialize the cache entry.  That will make it
easier to use when `cmake` is invoked under layers of scripting.

Closes: #26715
 2025-02-20 16:55:53 -05:00
Brad King 04721acc6c Tests: Cover CMAKE_POLICY_VERSION_MINIMUM in initial cache script 2025-02-20 16:27:05 -05:00
Brad King 729470ff6d Tests: Cover CMAKE_POLICY_VERSION_MINIMUM in script mode 2025-02-20 15:59:03 -05:00
Brad King 6cd10ffed7 Tests: Cover CMAKE_POLICY_VERSION_MINIMUM as cache entry 2025-02-20 15:48:00 -05:00
Matthew Woehlke da0d2a996d CPS: Fix importing from the prefix root 
Tweak resolution of CPS prefix path to support the case of the .cps file
being in the prefix root.
 2025-02-20 14:49:53 -05:00
Brad King d3484a31c6 Merge topic 'help-vs-properties' 
9955a3bb73 Help: Clarify EXCLUDE_FROM_DEFAULT_BUILD behavior
8fa9858e20 Help: Improve VS_SETTINGS and VS_TOOL_OVERRIDE documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10367
 2025-02-20 10:29:52 -05:00
Brad King 00a92521d0 Merge topic 'FindOpenCL-multiple-versions' 
520eb40e69 FindOpenCL: Fix version detection in presence of multiple versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10366
 2025-02-20 10:28:53 -05:00
Brad King 5585b2521e Merge topic 'compile-commands-posix-paths' 
971a8ded06 EXPORT_COMPILE_COMMANDS: Write absolute posix paths to compile_commands.json
ff119423b9 EXPORT_COMPILE_COMMANDS: Append missing newline to compile_commands.json
92fb080ed6 Tests/RunCMake/Swift: Fix CompileCommands expected regex
7d8b39226c cmGlobalNinjaGenerator: Remove obsolete TODO comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !10357
 2025-02-20 10:27:24 -05:00
Brad King 57a24181ed clang-tidy: Do not require config file if not running clang-tidy 
Since commit 00cfea965b (gitattributes: Do not export lint config files
in source archives, 2025-01-24, v4.0.0-rc1~129^2) the `.clang-tidy`
config file is not available in source archives.  Require it only when
the `CMake_RUN_CLANG_TIDY` option is turned on, which we only do in
development and CI builds.

Fixes: #26712
 2025-02-20 09:07:50 -05:00
Brad King aa42ba1ac8 gitattributes: Do not export pre-commit config file in source archives 
Exclude the file added by commit de59765336 (pre-commit: Add an initial
configuration file, 2025-01-04, v4.0.0-rc1~118^2~11).
 2025-02-20 09:03:42 -05:00
Brad King 77a742b088 Help: add_dependencies requires at least two arguments 
Update the documentation to match the implementation.
 2025-02-20 08:25:58 -05:00
Nikita Nemkin 33e85acff7 CPack/NSIS: Use the installed display name in uninstall prompt 
When a new installation prompts to uninstall the old version,
use the display name of the old version from the registry.

This only affects packages that change their CPACK_NSIS_DISPLAY_NAME.

Patch-by: David Golub <golubdr@gmail.com>
Fixes: #14112
 2025-02-20 13:12:11 +05:00
Kitware Robot ebe181646e CMake Nightly Date Stamp 2025-02-20 00:07:53 -05:00
Nikita Nemkin 9955a3bb73 Help: Clarify EXCLUDE_FROM_DEFAULT_BUILD behavior 
Note that solution build configurations ignore dependencies, unlike
the ALL_BUILD target.

Fixes: #12379
 2025-02-19 21:07:51 +05:00
Nikita Nemkin 8fa9858e20 Help: Improve VS_SETTINGS and VS_TOOL_OVERRIDE documentation 
Reorder paragraphs, adjust version notes, add cross-references,
note the ability to exclude files from the build.

Fixes: #11902
 2025-02-19 21:07:03 +05:00
Brad King 628423fbc1 Merge branch 'release-4.0' 2025-02-19 09:55:56 -05:00
Brad King 4b5b172a65 CMake 4.0.0-rc1 v4.0.0-rc1 2025-02-19 09:18:19 -05:00
redradist 520eb40e69 FindOpenCL: Fix version detection in presence of multiple versions 
Previously our call to `check_symbol_exists` was passing an absolute
path to the `cl.h` header to be included.  However, this might not
include its other headers correctly.  We already set
`CMAKE_REQUIRED_INCLUDES` such that `CL/cl.h` can be included by
the check, so we do not need to include by absolute path.
 2025-02-19 08:58:34 -05:00
Kitware Robot 110b217c14 CMake Nightly Date Stamp 2025-02-19 00:06:06 -05:00
ClausKlein 971a8ded06 EXPORT_COMPILE_COMMANDS: Write absolute posix paths to compile_commands.json 
Avoid platform-specific path formats in structured fields.
 2025-02-18 16:03:15 -05:00