mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 06:47:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
62,509 Commits 2 Branches 401 Tags
18d9a54ba6c225bc56f7de41b17e6c9ec0bebea3
Commit Graph

62509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 18d9a54ba6 Merge topic 'export-doc-config-map' 
38737e3970 Help: Mention imported config mapping in export() and install() docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8637
 2023-07-18 13:51:16 -04:00
Brad King e1fed863cd Merge branch 'release-3.27' 2023-07-18 13:50:05 -04:00
Brad King e48b1b8b52 Merge branch 'release-3.26' 2023-07-18 13:50:03 -04:00
Brad King 74c41f89c5 Merge branch 'release-3.26' into release-3.27 2023-07-18 13:49:46 -04:00
Brad King fbede716b2 Merge branch 'release-3.27' 2023-07-18 13:48:50 -04:00
Brad King e4819c3a7a Merge topic 'armclang-update-version-computation' 
65fac2fa35 ARMClang: Fix computation of compiler semantic version patch level

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8636
 2023-07-18 13:48:50 -04:00
Brad King a881ae61f1 Merge topic 'armclang-update-version-computation' into release-3.27 
65fac2fa35 ARMClang: Fix computation of compiler semantic version patch level

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8636
 2023-07-18 13:48:49 -04:00
Brad King 0ef3b9fd76 Merge branch 'armclang-update-version-computation' into release-3.26 
Merge-request: !8636
 2023-07-18 13:31:12 -04:00
Daniel Brondani 65fac2fa35 ARMClang: Fix computation of compiler semantic version patch level 
According to ARMClang documentation 6.20, the patch version number
should not include the last two digits of `__ARMCOMPILER_VERSION`,
which are reserved for internal use by ARM.
 2023-07-18 13:29:01 -04:00
Brad King 38737e3970 Help: Mention imported config mapping in export() and install() docs 
Suggest the `CMAKE_MAP_IMPORTED_CONFIG_<CONFIG>` variable for mapping
configurations of dependent projects to configurations exported by these
commands.

Issue: #25096
 2023-07-18 11:11:14 -04:00
Brad King 71c6525492 Merge topic 'LINK_OPTIONS-dollar-escaping' 
3c685a578a LINK_OPTIONS: ensure correct dollar escaping

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8608
 2023-07-18 10:32:05 -04:00
Brad King 39880e09d4 Merge topic 'tutorial-updates' 
5e56300742 Tutorial: Refactor Step 10
93289830ea Tutorial: Clarify Step 4 TODO 4
c65e01a979 Tutorial: Clarify Step 3
4f955834cf Tutorial: Fix Step 1 TODO 1 to be expandable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8590
 2023-07-18 10:31:17 -04:00
Brad King c36c6e7e3f Merge branch 'release-3.27' 2023-07-18 10:29:57 -04:00
Brad King e9659abde1 Merge topic 'innosetup-component-install' 
c80190c6ab InnoSetup: Always specify at least one component installation type

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8630
 2023-07-18 10:29:57 -04:00
Brad King 59ed19304b Merge topic 'innosetup-component-install' into release-3.27 
c80190c6ab InnoSetup: Always specify at least one component installation type

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8630
 2023-07-18 10:29:56 -04:00
Kitware Robot e21ea92798 CMake Nightly Date Stamp 2023-07-18 00:01:09 -04:00
Chris Mahoney 5e56300742 Tutorial: Refactor Step 10 2023-07-17 11:22:03 -04:00
Chris Mahoney 93289830ea Tutorial: Clarify Step 4 TODO 4 2023-07-17 11:22:03 -04:00
Chris Mahoney c65e01a979 Tutorial: Clarify Step 3 2023-07-17 11:21:56 -04:00
Jannik Alber c80190c6ab InnoSetup: Always specify at least one component installation type 
Inno Setup implicitly creates three installation types if none is
specified in the script. This causes some component features (e.g.
`REQUIRED`) to lose their functionality.  Teach the generator to always
specify a "custom" installation type when using components.

Fixes: #25083
 2023-07-17 10:30:25 -04:00
Marc Chevrier 3c685a578a LINK_OPTIONS: ensure correct dollar escaping 
Ensure correct escaping for Ninja and Makefile generators.

Fixes: #25049
 2023-07-17 15:55:58 +02:00
Kitware Robot a28217eb8c CMake Nightly Date Stamp 2023-07-17 00:01:50 -04:00
Kitware Robot d747bc18e1 CMake Nightly Date Stamp 2023-07-16 00:01:09 -04:00
Kitware Robot 2a68ba3117 CMake Nightly Date Stamp 2023-07-15 00:01:14 -04:00
Brad King 63fc43d129 Merge branch 'release-3.27' 2023-07-14 11:34:02 -04:00
Brad King 8bcba75b1c CMake 3.27.0-rc5 v3.27.0-rc5 2023-07-14 11:03:52 -04:00
Brad King 2376f15b51 Merge branch 'release-3.27' 2023-07-14 11:03:10 -04:00
Brad King 08cdc91c09 Merge topic 'FindProtobuf-version-schemes' 
6e90d79577 FindProtobuf: Fix new version number scheme

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8629
 2023-07-14 11:03:10 -04:00
Brad King 6cb290559e Merge topic 'FindProtobuf-version-schemes' into release-3.27 
6e90d79577 FindProtobuf: Fix new version number scheme

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8629
 2023-07-14 11:03:09 -04:00
Jannik Beyerstedt 6e90d79577 FindProtobuf: Fix new version number scheme 
Revise the changes from commit fc7dcc6a24 (FindProtobuf: Support new
version number scheme, 2023-06-19, v3.27.0-rc3~2^2).  Changing the
content of `Protobuf_VERSION` to exclude the major version of the library
might break code as it can't be used to detect breaking changes in the
library any more.

However, protoc v22 and up don't print the major version any more, so we
need to compare the against a truncated version number, too.
 2023-07-14 09:34:13 -04:00
Brad King 802a0aefd5 Merge topic 'find_library-simplify-regex' 
f60e921262 find_library: Improve regex readability in --debug-find output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8618
 2023-07-14 08:42:11 -04:00
Brad King 278d8ccacb Merge topic 'upstream-vim-cmake-syntax' 
664b0e2fc3 Merge branch 'upstream-vim-cmake-syntax'
1594a34250 vim-cmake-syntax 2023-07-13 (7c6f28d0)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8627
 2023-07-14 08:40:28 -04:00
Brad King cd52dddc98 Merge topic 'module-mapper-clang-transitive' 
57ef353d22 cmExperimental: refresh the C++ modules UUID
7b05724ac8 cmCxxModuleMapper: give transitive usages to Clang as well
c9df4568da cmCxxModuleMapper: factor out transitive usage computation
71f1483aac Tests/RunCMake/CXXModules: require transitive usages
e39b6ebc19 cmCxxModuleMapper: use a `char` for streaming single bytes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8610
 2023-07-14 08:39:37 -04:00
Brad King 50a83674c1 Merge branch 'release-3.27' 2023-07-14 08:38:04 -04:00
Brad King 410721477b Merge topic 'doc-list-genex' 
326a73a328 Help: Improve formatting and wording of LIST generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8621
 2023-07-14 08:38:04 -04:00
Brad King 1f42b0299b Merge topic 'doc-list-genex' into release-3.27 
326a73a328 Help: Improve formatting and wording of LIST generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8621
 2023-07-14 08:38:03 -04:00
Brad King 6ddedad5d7 Merge branch 'release-3.27' 2023-07-14 08:35:48 -04:00
Brad King 9ce6ed1e00 Merge topic 'doc-search-names' 
094c5a089d Utilities/Sphinx: Restore html search index link anchors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8628
 2023-07-14 08:35:48 -04:00
Brad King 6b6271521a Merge topic 'doc-search-names' into release-3.27 
094c5a089d Utilities/Sphinx: Restore html search index link anchors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8628
 2023-07-14 08:35:47 -04:00
Brad King fba53b2972 Merge branch 'release-3.27' 2023-07-14 08:34:30 -04:00
Brad King c9b1ce71f6 Merge topic 'debugger-breakpoints' 
60b6383993 Debugger: Always clear existing breakpoints on setBreakpoints

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8624
 2023-07-14 08:34:30 -04:00
Brad King 78363b4d3c Merge topic 'debugger-breakpoints' into release-3.27 
60b6383993 Debugger: Always clear existing breakpoints on setBreakpoints

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8624
 2023-07-14 08:34:29 -04:00
Brad King eea8818019 Merge branch 'release-3.27' 2023-07-14 08:33:13 -04:00
Brad King ba616fcb6d Merge topic 'android-platform' 
bfe4722a61 Android: Restore platform info and search paths shared with Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8626
 2023-07-14 08:33:13 -04:00
Brad King dbbbedb3af Merge topic 'android-platform' into release-3.27 
bfe4722a61 Android: Restore platform info and search paths shared with Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8626
 2023-07-14 08:33:12 -04:00
Kitware Robot 3087b3dbac CMake Nightly Date Stamp 2023-07-14 00:01:11 -04:00
Brad King 094c5a089d Utilities/Sphinx: Restore html search index link anchors 
Since commit 37e015d4a6 (Utilities/Sphinx: Refactor Sphinx reference
recording, 2023-03-08, v3.27.0-rc1~342^2~1), anchors in links to cmake
domain objects generated in html search results were missing their
object type prefix, and thus did not link to the object.

Restore our `get_objects` implementation's second tuple entry to what we
used prior to that commit.  This matches what Sphinx's builtin python,
rst, and javascript modes do.

Fixes: #25067
 2023-07-13 12:16:39 -04:00
Thomas Schenker f60e921262 find_library: Improve regex readability in --debug-find output 
If there is only one possible library prefix/suffix, omit the capture
group around it in the debug output.
 2023-07-13 09:48:35 -04:00
Patrick Boettcher 664b0e2fc3 Merge branch 'upstream-vim-cmake-syntax' 
* upstream-vim-cmake-syntax:
  vim-cmake-syntax 2023-07-13 (7c6f28d0)
 2023-07-13 15:14:56 +02:00
vim-cmake-syntax upstream 1594a34250 vim-cmake-syntax 2023-07-13 (7c6f28d0) 
Code extracted from:

    https://github.com/pboettch/vim-cmake-syntax.git

at commit 7c6f28d008e3b9c372bd2a5d51b92c0966a72b1b (master).

Upstream Shortlog
-----------------

Patrick Boettcher (5):
      5cb0409a update keywords to 3.26.4
      0f46703c fix bracket-comment-regex
      79121696 add syntax for FetchContent
      9578e406 blacklist GNU as keyword
      7c6f28d0 update to cmake version 3.27.20230713-gdc88dd5

VZ (1):
      ddb54ba6 Fix spell checking inside CMake functions
 2023-07-13 15:13:18 +02:00