summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-vim-cmake-syntax'Patrick Boettcher2023-07-133-59/+816
|\ | | | | | | | | * upstream-vim-cmake-syntax: vim-cmake-syntax 2023-07-13 (7c6f28d0)
| * vim-cmake-syntax 2023-07-13 (7c6f28d0)vim-cmake-syntax upstream2023-07-133-60/+917
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | CMake Nightly Date StampKitware Robot2023-07-131-1/+1
| |
* | Merge branch 'release-3.27'Brad King2023-07-120-0/+0
|\ \
| * \ Merge topic 'compile-commands-modules' into release-3.27Brad King2023-07-1214-10/+99
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 677b28dc7b Ninja: include module mapper flags in `compile_commands.json` Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8611
* | \ \ Merge topic 'compile-commands-modules'Brad King2023-07-1214-10/+99
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 677b28dc7b Ninja: include module mapper flags in `compile_commands.json` Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8611
| * | | Ninja: include module mapper flags in `compile_commands.json`Ben Boeckel2023-07-0914-10/+99
| | | | | | | | | | | | | | | | Fixes: #24618
* | | | Merge topic 'apple-visionos'Brad King2023-07-1226-26/+100
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25977e177b apple: add preliminary visionOS support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Jason Juang <jasjuang@gmail.com> Acked-by: Patrick Fu <paaatrickfu@gmail.com> Acked-by: Volodymyr B. <v.boichentsov@elsevier.com> Merge-request: !8581
| * | | | apple: add preliminary visionOS supportGregor Jasny2023-07-1126-26/+100
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2023-07-121-1/+1
|/ / / /
* | | | Merge topic 'cmList-regression'Brad King2023-07-111-7/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6e8811cf0 cmList: Fix performance regression in Join / to_string Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8612
| * | | | cmList: Fix performance regression in Join / to_stringNicolas van Kempen2023-07-061-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 45f17e5a85 (cmList: Add container conversion to string, 2023-06-20) accidentally introduced unnecessary string copies and allocations. Remove unnecessary copies.
* | | | | Merge topic 'test-lib-order'Brad King2023-07-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2a28d185a Tests: Improve order of CMakeLibTests link libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8617
| * | | | | Tests: Improve order of CMakeLibTests link librariesBrad King2023-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Avoid repeating `libCMakeLib.a` multiple times on the link line.
* | | | | | Merge branch 'release-3.27'Brad King2023-07-110-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'hip-vim-syntax' into release-3.27Brad King2023-07-111-0/+81
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90a949f7ce HIP: Add HIP language to Vim syntax highlighting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8615
* | \ \ \ \ \ Merge topic 'hip-vim-syntax'Brad King2023-07-111-0/+81
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90a949f7ce HIP: Add HIP language to Vim syntax highlighting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8615
| * | | | | | HIP: Add HIP language to Vim syntax highlightingCordell Bloor2023-07-071-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HIP language shares most properties in common with CXX or CUDA, although there are a few from each that it doesn't share.
* | | | | | | CMake Nightly Date StampKitware Robot2023-07-111-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2023-07-101-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2023-07-091-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2023-07-081-1/+1
| | | | | | |
* | | | | | | Merge topic 'source_group-TREE-no-FILES'Brad King2023-07-076-3/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87788353cc source_group: Add test/example for TREE without FILES d85238a2f2 source_group: Fix TREE without FILES Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8599
| * | | | | | | source_group: Add test/example for TREE without FILESAlex Neundorf2023-07-055-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This creates an additional target and for its three source files a directory tree is created.
| * | | | | | | source_group: Fix TREE without FILESAlex Neundorf2023-07-051-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the documentation of `source_group()` the `FILES` parameter is optional, but that was actually not the case. When using `source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR})` cmake did not previously create the source tree, but recognized it as the old syntax. With this patch, cmake recognizes it as `TREE` syntax if the first argument is TREE followed by a directory. Then, if no files are given, it defaults to all files in the directory. PREFIX works too. Fixes: #24590
* | | | | | | | Merge topic 'android-host-system-version'Brad King2023-07-071-0/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fff6c469f8 Android: Populate CMAKE_HOST_SYSTEM_VERSION on native builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8607
| * | | | | | | | Android: Populate CMAKE_HOST_SYSTEM_VERSION on native buildsfunsafe-ptr2023-07-051-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up commit c5892e484e (Android: add support for native compilation, such as with the Termux app, 2019-10-15, v3.17.0-rc1~594^2).
* | | | | | | | | Merge branch 'release-3.27'Brad King2023-07-070-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'findprotobuf-mingw' into release-3.27Brad King2023-07-071-3/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e978b3b814 FindProtobuf: Fix linking to shared libraries on MinGW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8609
* | \ \ \ \ \ \ \ \ Merge topic 'findprotobuf-mingw'Brad King2023-07-071-3/+3
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e978b3b814 FindProtobuf: Fix linking to shared libraries on MinGW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8609
| * | | | | | | | | FindProtobuf: Fix linking to shared libraries on MinGWمهدي شينون (Mehdi Chinoune)2023-07-051-3/+3
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #25011
* | | | | | | | | Merge branch 'release-3.27'Brad King2023-07-070-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'msvc-embed-manifest-direct' into release-3.27Brad King2023-07-071-0/+20
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a07bcc149 MSVC: Restore support for non-incremental linking without 'rc' in PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8613
* | | | | | | | | Merge topic 'msvc-embed-manifest-direct'Brad King2023-07-071-0/+20
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a07bcc149 MSVC: Restore support for non-incremental linking without 'rc' in PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8613
| * | | | | | | | MSVC: Restore support for non-incremental linking without 'rc' in PATHBrad King2023-07-061-0/+20
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0b552eb877 (MSVC: Embed manifests directly for non-incremental vs_link_exe links, 2023-02-20, v3.27.0-rc1~438^2) we tell the MSVC `link` tool to embed manifests directly rather than running `mt` ourselves. However, `link` expects `rc` to be in the PATH when embedding manifests. Although that is normally true, some users prepare minimal environments and explicitly specify include and link directories for the Windows SDK. In such cases, `rc` is not in the PATH and is explicitly specified in `CMAKE_RC_COMPILER`. Restore support for such cases by explicitly adding the RC location to the end of the PATH. Fixes: #25047
* | | | | | | | Merge branch 'release-3.27'Brad King2023-07-070-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'hip-lib64' into release-3.27Brad King2023-07-071-1/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f79428619e HIP: Fix search for hip-lang CMake package on Fedora distros Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8614
* | | | | | | | Merge topic 'hip-lib64'Brad King2023-07-071-1/+10
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | f79428619e HIP: Fix search for hip-lang CMake package on Fedora distros Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8614
| * | | | | | HIP: Fix search for hip-lang CMake package on Fedora distrosBrad King2023-07-051-1/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These distros package the hip-lang package under `lib64`, so search it too. This is similar to commit bae57dc281 (HIP: Fix search for hip-lang CMake package on multiarch distros, 2023-05-31, v3.27.0-rc1~28^2). Fixes: #25050
* | | | | | CMake Nightly Date StampKitware Robot2023-07-071-1/+1
| |_|_|/ / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2023-07-061-1/+1
| | | | |
* | | | | Merge topic 'FindProtobuf-upstream-options'Brad King2023-07-051-12/+111
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f784ef75a7 FindProtobuf: Add documentation for protobuf_generate() cd3ff53c88 FindProtobuf: Add DEPENDENCIES to protobuf_generate 31adc11030 FindProtobuf: Add PLUGIN_OPTIONS and PROTOC_OPTIONS to protobuf_generate Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8601
| * | | | | FindProtobuf: Add documentation for protobuf_generate()André Apitzsch2023-06-301-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note, the argument `DESCRIPTORS` is not documented as upstream doesn't provide this argument and code might break when switching to upstream later. Instead of the argument `DESCRIPTORS` `PROTOC_OPTIONS "--descriptor_set_out=NAME.desc"` can be used. Argument description has been copied from [1]. Fixes: #23037 [1] https://github.com/protocolbuffers/protobuf/blob/8ec0295ad7fc83d20609fcdf4830e3e3fddf2912/docs/cmake_protobuf_generate.md
| * | | | | FindProtobuf: Add DEPENDENCIES to protobuf_generateAndré Apitzsch2023-06-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | See upstream PR for details https://github.com/protocolbuffers/protobuf/pull/10014.
| * | | | | FindProtobuf: Add PLUGIN_OPTIONS and PROTOC_OPTIONS to protobuf_generateAndré Apitzsch2023-06-301-11/+30
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2023-07-051-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2023-07-041-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2023-07-031-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2023-07-021-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2023-07-011-1/+1
| |_|/ / / |/| | | |