Commit Graph

60881 Commits

Author SHA1 Message Date
Brad King 0abeb3e394 Tests: Remove references to dropped KWSys SharedForward component 2023-02-07 10:50:17 -05:00
Brad King 6819e080fa Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2023-02-07 (db9470d4)
2023-02-07 09:54:19 -05:00
KWSys Upstream 48fd1b3887 KWSys 2023-02-07 (db9470d4)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit db9470d4271ef65864a374a7a2f58f9789573903 (master).

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

Ben Boeckel (1):
      46f47034 SharedForward: Drop this component of KWSys

Brad King (2):
      bfa688b5 SystemTools: Drop optional FindProgramPath arguments
      093d6e45 DynamicLoader: Update test to avoid using CMAKE_INTDIR
2023-02-07 09:54:18 -05:00
Brad King 8c61f15cdc Merge topic 'avoid-cmake-cfg-intdir'
2b17b6da6a cmGlobalGenerator: Avoid referencing CMAKE_CFG_INTDIR
f34876561f Tests: Remove or silence instances of ${CMAKE_CFG_INTDIR}
78cf427157 RULE_LAUNCH_*: Add support for generator expressions
cabad8a37f ExternalProject: Always use $<CONFIG> for source files
62e8884d3f CTestTargets: Use $<CONFIG> instead of ${CMAKE_CFG_INTDIR}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8169
2023-02-07 09:52:32 -05:00
Brad King 9bef06d0a5 Merge topic 'custom-command-policies'
480b363724 cmCustomCommand: Refactor custom command-specific policy values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8168
2023-02-07 09:49:49 -05:00
Brad King 921d8c4d64 Merge topic 'cmCLI-string-cleanup'
af08f9dc55 cmComputeLinkInformation: use characters where possible
52ca45e485 cmComputeLinkInformation: combine string literals where possible
41da256b02 cmComputeLinkInformation: use `cmStrCat` where appropriate

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !8160
2023-02-07 09:49:07 -05:00
Brad King 9492ca9a3f Merge topic 'KateImprovements'
e7f7bff4f5 Kate: improve the way the VCS-specific files are searched
96389b4cd3 Kate: add support for hg and fossil
4c32623f5f Help: fix typo in docs for set_property()
9a7612d2d0 Kate: make it possible to force a mode for the "files" entry
8a7aa2642b Help: add documentation for Kate-related variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8154
2023-02-07 09:48:23 -05:00
Brad King 20b6356cab Merge topic 'tinyfix'
835d50895a cmake.cxx: Fix lambda name typo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: jcl xx <jonathan2dog@gmail.com>
Merge-request: !8167
2023-02-07 09:47:28 -05:00
Brad King 91e4620c65 Merge branch 'release-3.26' 2023-02-07 09:34:01 -05:00
Brad King 0a6d7722e6 Merge branch 'release-3.25' 2023-02-07 09:33:59 -05:00
Brad King 26f962f8b1 Merge branch 'release-3.25' into release-3.26 2023-02-07 09:33:52 -05:00
Brad King e5d4101be0 Merge branch 'release-3.26' 2023-02-07 09:32:21 -05:00
Brad King 60911f4ebc Merge topic 'android-ndk-legacy-toolchain'
cb0b9452e8 Android: Provide CMAKE_ANDROID_NDK_VERSION with NDK legacy toolchain file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8170
2023-02-07 09:32:20 -05:00
Brad King 5d40cf45fa Merge topic 'android-ndk-legacy-toolchain' into release-3.26
cb0b9452e8 Android: Provide CMAKE_ANDROID_NDK_VERSION with NDK legacy toolchain file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8170
2023-02-07 09:32:19 -05:00
Brad King d2be571ae2 Merge branch 'release-3.26' 2023-02-07 09:01:54 -05:00
Brad King ff93377354 Merge topic 'cxxmodules-proper-mangling'
3f1e005067 Tests/RunCMake/CXXModules: declare `forwarding` as `extern "C++"`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8159
2023-02-07 09:01:54 -05:00
Brad King c323d446d6 Merge topic 'cxxmodules-proper-mangling' into release-3.26
3f1e005067 Tests/RunCMake/CXXModules: declare `forwarding` as `extern "C++"`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8159
2023-02-07 09:01:53 -05:00
Brad King e190b93ed4 Merge branch 'release-3.26' 2023-02-07 09:00:37 -05:00
Brad King da5c90ae2e Merge topic 'FindCUDAToolkit-nvrtc-builtins'
9688a8ebc2 FindCUDAToolkit: Fix `nvrtc_builtins_static` library name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8162
2023-02-07 09:00:36 -05:00
Brad King 7aee115ff4 Merge topic 'FindCUDAToolkit-nvrtc-builtins' into release-3.26
9688a8ebc2 FindCUDAToolkit: Fix `nvrtc_builtins_static` library name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8162
2023-02-07 09:00:35 -05:00
Brad King e2fa8fe5ec Merge branch 'release-3.26' 2023-02-07 08:58:49 -05:00
Brad King 33a30da3da Merge topic 'docexe' into release-3.26
1e95f765d5 Help: Clarify interaction of execute_process *_FILE and *_VARIABLE options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8165
2023-02-07 08:58:48 -05:00
Brad King 5049d86a57 Merge topic 'docexe'
1e95f765d5 Help: Clarify interaction of execute_process *_FILE and *_VARIABLE options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8165
2023-02-07 08:58:48 -05:00
Brad King a927bed037 Merge branch 'release-3.26' 2023-02-07 08:57:46 -05:00
Brad King 6cb6a2fabe Merge topic 'docfix'
d3ece40602 Help: cmake (1): remove -E server as not available
b19036d8b3 Help: CheckSource{Compiles,Runs}: fix typo and clarify

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8164
2023-02-07 08:57:46 -05:00
Brad King 94804e55f5 Merge topic 'docfix' into release-3.26
d3ece40602 Help: cmake (1): remove -E server as not available
b19036d8b3 Help: CheckSource{Compiles,Runs}: fix typo and clarify

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8164
2023-02-07 08:57:45 -05:00
Brad King 517c29a9e4 Merge branch 'release-3.26' 2023-02-07 08:56:37 -05:00
Brad King c7cf071d24 Merge topic 'ci-docker-layers'
354fdf2116 ci: Reduce intermediate docker layers and final image size

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8145
2023-02-07 08:56:36 -05:00
Brad King e3593a7a9f Merge topic 'ci-docker-layers' into release-3.26
354fdf2116 ci: Reduce intermediate docker layers and final image size

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8145
2023-02-07 08:56:35 -05:00
Kitware Robot 448e9ab022 CMake Nightly Date Stamp 2023-02-07 00:01:11 -05:00
Brad King 29dc3e7722 Merge branch 'android-ndk-legacy-toolchain' into release-3.25
Merge-request: !8170
2023-02-06 17:27:48 -05:00
Brad King cb0b9452e8 Android: Provide CMAKE_ANDROID_NDK_VERSION with NDK legacy toolchain file
This variable has been provided since commit 746906242d (Android: Detect
NDK version number, 2021-02-26, v3.20.0-rc3~1^2~3) when using CMake's
NDK support or the modern NDK toolchain file.  Since commit 005e2cdfb0
(Android: Do not use gold for ndk >= r22, 2021-02-26, v3.20.0-rc3~1^2)
we need the value in our compiler/platform information files, so provide
it when using the NDK legacy toolchain file too.

Revert commit 1c86e397fe (Android/Clang: Tolerate undefined
CMAKE_ANDROID_NDK_VERSION, 2022-09-16, v3.25.0-rc1~118^2) since the
variable should now always be defined.

Issue: #21772
Fixes: #24386
2023-02-06 17:17:25 -05:00
Kyle Edwards 480b363724 cmCustomCommand: Refactor custom command-specific policy values
Many custom commands are created by CMake itself rather than by
the user. These custom commands should always have their policies
set to NEW, and user-created custom commands should have their
policy values set only from the state snapshot. In addition, we
want to genericize the mechanism of recording a policy at the time
of custom command creation.

Add a CM_FOR_EACH_CUSTOM_COMMAND_POLICY macro to genericize
custom command policies. Use this to define all custom command
policies. Make all such policies NEW instead of WARN by default.
Remove individual policy modifier methods and add a single method
that records relevant values from a cmStateSnapshot. Remove the
no longer needed explicit policy settings from synthesized custom
commands.
2023-02-06 15:04:16 -05:00
Ben Boeckel af08f9dc55 cmComputeLinkInformation: use characters where possible 2023-02-06 13:41:00 -05:00
Ben Boeckel 52ca45e485 cmComputeLinkInformation: combine string literals where possible 2023-02-06 13:40:36 -05:00
Alexander Neundorf e7f7bff4f5 Kate: improve the way the VCS-specific files are searched
Before, CMake only checked for the .svn etc. directory only in
${CMAKE_SOURCE_DIR}, now it also goes the directories up to check
whether those VCS directories exist in one of the parent directories.
2023-02-06 10:23:03 -05:00
Alexander Neundorf 96389b4cd3 Kate: add support for hg and fossil
Both VCS are supported by kate nowadays.
2023-02-06 10:22:10 -05:00
Alexander Neundorf 4c32623f5f Help: fix typo in docs for set_property() 2023-02-06 10:21:35 -05:00
Alexander Neundorf 9a7612d2d0 Kate: make it possible to force a mode for the "files" entry
By default, kate will try to autodetect whether the project is
a svn or git checkout or not.
In case this does not give a satisfying result, the user can now
set CMAKE_KATE_FILES_MODE to the mode he wants.
2023-02-06 10:21:19 -05:00
Alex Turbov 354fdf2116 ci: Reduce intermediate docker layers and final image size
Instead of `COPY` to get tar files, execute `RUN` w/ `--mount`.
Note that this requires the docker "buildkit" feature to be enabled.
2023-02-06 10:13:06 -05:00
scivision d3ece40602 Help: cmake (1): remove -E server as not available
... since CMake 3.20
2023-02-06 09:57:57 -05:00
scivision b19036d8b3 Help: CheckSource{Compiles,Runs}: fix typo and clarify 2023-02-06 09:55:23 -05:00
scivision 1e95f765d5 Help: Clarify interaction of execute_process *_FILE and *_VARIABLE options
These parameters are so important that it's worthwhile to be more
explicit about their interaction.

Fixes: #24392
2023-02-06 09:47:52 -05:00
Paul Taylor 9688a8ebc2 FindCUDAToolkit: Fix nvrtc_builtins_static library name
Update the change from commit 2a94c762ed (FindCUDAToolkit: Add support
for CUDA::nvrtc_static, 2023-01-20, v3.26.0-rc1~55^2).  The lib is named
`libnvrtc-builtins_static.a`, not `libnvrtc_builtins_static.a`.
2023-02-06 09:36:43 -05:00
jcl xx 835d50895a cmake.cxx: Fix lambda name typo
Fix function name typo `ToolsetLamda` to `ToolsetLambda`.
2023-02-06 09:32:17 -05:00
Brad King dad1234ba1 Merge topic 'test-cleanup-COnly'
f7a165ddcb Tests: Drop redundant string(ASCII) case from COnly test
7e3229d7f9 Tests: Move LINK_FLAGS case from COnly to LinkFlags test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8161
2023-02-06 09:27:22 -05:00
Brad King bfe24f1764 Merge topic 'compiler-id-flags-with-quotes'
7201bc072c CompilerId: Fix handling of CMAKE_<LANG>_FLAGS with quotes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8158
2023-02-06 09:25:37 -05:00
Brad King 6a9c413729 Merge topic 'FindPNG-FindOpenCL-windows-locations'
5e8e5d4744 FindOpenCL: Add default install locations on Windows
9b6eb2c909 FindPNG: Add default install locations on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8156
2023-02-06 09:24:47 -05:00
Kitware Robot c7c6c5debf CMake Nightly Date Stamp 2023-02-06 00:02:29 -05:00
Kitware Robot 13b0c2d432 CMake Nightly Date Stamp 2023-02-05 00:01:10 -05:00