Commit Graph

60114 Commits

Author SHA1 Message Date
Pierre Testart f69d1872db cmGeneratorTarget: Add caches to some functions
Add caches to the following cmGeneratorTarget functions in order to
improve performance:
- GetIncludeDirectories
- GetCompileOptions
- GetCompileDefinitions
- GetPrecompileHeaders
- GetLinkOptions
- GetLinkDirectories
2022-11-28 08:40:11 -08:00
Kitware Robot b4e373aa9d CMake Nightly Date Stamp 2022-11-28 00:01:19 -05:00
Kitware Robot 00630bbac7 CMake Nightly Date Stamp 2022-11-27 00:01:08 -05:00
Kitware Robot e35772d96a CMake Nightly Date Stamp 2022-11-26 00:01:14 -05:00
Kitware Robot b92d0971db CMake Nightly Date Stamp 2022-11-25 00:01:06 -05:00
Kitware Robot 93ded7304a CMake Nightly Date Stamp 2022-11-24 00:01:11 -05:00
Brad King 9b9a421668 Merge topic 'find_cuda_toolkit_support_symlink_math_dirs'
989d50d7fc FindCUDAToolkit: Support nvhpc splayed layouts without symlinks
207518b6e8 FindCUDAToolkit: Handle CUDAToolkit_TARGET_DIR dir being a symlink

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7945
2022-11-23 07:11:59 -05:00
Brad King c924d33bec Merge topic 'cxxmodule-module-support-tweaks'
c53748cc09 Tests/RunCMake/CXXModules: mark IMPORTED targets as INTERFACE
a971fcfde7 cmNinjaNormalTargetGenerator: use `cmStrCat`
b7509d6bf8 cmNinjaNormalTargetGenerator: fix grammar in verbose comment
0015cb95de cmGlobalNinjaGenerator: fix comment typo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7943
2022-11-23 07:10:52 -05:00
Brad King 22fdf42e92 Merge branch 'release-3.25' 2022-11-23 07:09:10 -05:00
Brad King af937d2933 Merge topic 'try_compile-copy-config'
80fc564dd7 try_compile: Restore COPY_FILE with CMAKE_TRY_COMPILE_CONFIGURATION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !7948
2022-11-23 07:09:10 -05:00
Brad King 90907c8ff9 Merge topic 'try_compile-copy-config' into release-3.25
80fc564dd7 try_compile: Restore COPY_FILE with CMAKE_TRY_COMPILE_CONFIGURATION

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !7948
2022-11-23 07:09:09 -05:00
Brad King a195dd2a6c Merge branch 'release-3.25' 2022-11-23 07:08:02 -05:00
Brad King 7c462e36c9 Merge topic 'XCode-XCODE_LINK_BUILD_PHASE_MODE-and-LINK_LIBRARY-genex'
61075d2d7b XCode: ensure LINK_LIBRARY genex is usable with XCODE_LINK_BUILD_PHASE_MODE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7947
2022-11-23 07:08:01 -05:00
Brad King 3bb47e43f0 Merge topic 'XCode-XCODE_LINK_BUILD_PHASE_MODE-and-LINK_LIBRARY-genex' into release-3.25
61075d2d7b XCode: ensure LINK_LIBRARY genex is usable with XCODE_LINK_BUILD_PHASE_MODE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7947
2022-11-23 07:08:00 -05:00
Kitware Robot 7c39301ebf CMake Nightly Date Stamp 2022-11-23 00:01:14 -05:00
Brad King 80fc564dd7 try_compile: Restore COPY_FILE with CMAKE_TRY_COMPILE_CONFIGURATION
Since commit 0c141b0393 (try_compile: Record output location instead of
reverse computing it, 2022-08-31, v3.25.0-rc1~154^2) we always look for
the "Debug" configuration's output binary from the test project.
Restore looking for the `CMAKE_TRY_COMPILE_CONFIGURATION`.

Fixes: #24180
2022-11-22 11:26:28 -05:00
Marc Chevrier 61075d2d7b XCode: ensure LINK_LIBRARY genex is usable with XCODE_LINK_BUILD_PHASE_MODE
Fixes: #24176
2022-11-22 16:44:45 +01:00
Brad King 1f9ee2b8df Merge branch 'release-3.25' 2022-11-22 09:51:59 -05:00
Brad King a27663621f Merge topic 'cxxmodules-doc-msvc-modmapfmt'
19fc1ba630 Help/dev/experimental: document the `msvc` module map format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7944
2022-11-22 09:51:59 -05:00
Brad King 3d1f91a245 Merge topic 'cxxmodules-doc-msvc-modmapfmt' into release-3.25
19fc1ba630 Help/dev/experimental: document the `msvc` module map format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7944
2022-11-22 09:51:58 -05:00
Brad King e1b757602c Merge topic 'find_dependency-dedup'
fb9a3d0c7d find_dependency: Avoid repeating identical dependency searches
5fbda0f572 find_dependency: Unset temporary variables before returning
591b75ee17 Tests: Add case covering transitive find_dependency calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7936
2022-11-22 09:50:12 -05:00
Brad King 1f6a6d6aad Merge topic 'use-rsp-in-makefiles'
b1a3a38e03 Makefiles: Name object response files with .rsp extension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: kossnikita <kossnikita@gmail.com>
Merge-request: !7942
2022-11-22 09:48:53 -05:00
Brad King 62172b4ab7 Merge topic 'custom-command-comment-genex'
26d813092b add_custom_{command,target}: add genex support for COMMENT
60a5a39022 cmCustomCommandGenerator: refactor GetComment to return std::string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7887
2022-11-22 09:47:59 -05:00
Brad King a449a840bd Merge topic 'opencl_framework'
2e2c1e3ea5 OpenCL: Do not assume that OpenCL framework is always used in Apple

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7941
2022-11-22 09:46:35 -05:00
Brad King 40cb52bc9d Merge branch 'release-3.25' 2022-11-22 09:45:23 -05:00
Brad King 3f0fbff9a3 Merge topic 'FindCUDA-nppicom'
3ddfdc38eb FindCUDA: Do not use CUDA_nppicom_LIBRARY in CUDA 11.0+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7938
2022-11-22 09:45:22 -05:00
Brad King 0a802d0f9e Merge topic 'FindCUDA-nppicom' into release-3.25
3ddfdc38eb FindCUDA: Do not use CUDA_nppicom_LIBRARY in CUDA 11.0+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7938
2022-11-22 09:45:21 -05:00
Robert Maynard 989d50d7fc FindCUDAToolkit: Support nvhpc splayed layouts without symlinks 2022-11-22 09:02:08 -05:00
Kitware Robot 9278ae6f1b CMake Nightly Date Stamp 2022-11-22 00:01:17 -05:00
Ben Boeckel c53748cc09 Tests/RunCMake/CXXModules: mark IMPORTED targets as INTERFACE
Now that `Ninja` generators will know to generate rules for `IMPORTED`
targets, mark these as `INTERFACE` to avoid requirements of actual
artifacts.
2022-11-21 18:22:00 -05:00
Ben Boeckel 19fc1ba630 Help/dev/experimental: document the msvc module map format 2022-11-21 18:20:46 -05:00
Ben Boeckel a971fcfde7 cmNinjaNormalTargetGenerator: use cmStrCat 2022-11-21 17:12:18 -05:00
Ben Boeckel b7509d6bf8 cmNinjaNormalTargetGenerator: fix grammar in verbose comment 2022-11-21 17:09:33 -05:00
Ben Boeckel 0015cb95de cmGlobalNinjaGenerator: fix comment typo 2022-11-21 17:09:33 -05:00
Felipe Torrezan b1a3a38e03 Makefiles: Name object response files with .rsp extension
This is more consistent with the Ninja generator, and is necessary
for the IAR linker to recognize the argument as a response file.

Fixes: #24165
2022-11-21 10:29:24 -05:00
Brad King dae70fa7e8 Merge topic 'help-remove-self-reference-links'
eb77695e25 Help: clean up some minor typos
c36910476a Help: remove links from pages to themselves
391c53a851 Help/prop_tgt/LINK_OPTIONS: fix `:genex:` reference
de4909ea16 Help: fix some minor markup errors
c42c77b020 Help/CMAKE_GLOBAL_AUTORCC_TARGET_NAME: fix link reference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7940
2022-11-21 10:07:07 -05:00
Brad King e69251c828 Merge topic 'xcode-ios-extensionkit'
b99c386122 Xcode: Allow bundling extensionkit extensions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7900
2022-11-21 10:06:20 -05:00
Brad King 55e3168dc4 Merge topic 'lang-std-flag-order'
a1c20b08b4 cmLocalGenerator: Inline AddCompilerRequirementFlag in only call site
914571a042 Place language standard flags just after CMAKE_<LANG>_FLAGS
ad16ae5c70 VS: Recognize -std: flag in CMAKE_C_FLAGS in target with C++ sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7931
2022-11-21 10:03:35 -05:00
Brad King 973d88c25f Merge topic 'clang-tidy-module-cmstrlen-check-sizeof'
830eed374d CMake: fix sizeof string literal violations
c6368a23fe clang-tidy module: look for sizeof string literal in cmStrLen() check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7927
2022-11-21 10:01:14 -05:00
Brad King fa7afe5eb3 Merge topic 'cxx-scanning-properties'
a02d792c6e cxxmodules: add properties to control scanning
008c09d6db cmNinjaTargetGenerator: factor out determining the fileset of a source

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7935
2022-11-21 10:00:12 -05:00
Brad King 38660bfc20 Merge topic 'test-file-download'
28513a5fba Tests: Honor CMake_TEST_NO_NETWORK in RunCMake.file-DOWNLOAD
52b9c7b958 Tests: Move CMake.FileDownload cases into RunCMake.file-DOWNLOAD
9dda7c276c Tests: Factor out common helper in RunCMake.file-DOWNLOAD cases
d6af54c473 Tests: Factor out a RunCMake.file-DOWNLOAD test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7937
2022-11-21 09:52:29 -05:00
Brad King 2a06f3ca03 Merge topic 'ci-flang'
99370e990e gitlab-ci: add jobs to test with Clang and LLVMFlang on Fedora

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7939
2022-11-21 09:48:48 -05:00
Kitware Robot a0dbfb99aa CMake Nightly Date Stamp 2022-11-21 00:01:15 -05:00
Isuru Fernando 2e2c1e3ea5 OpenCL: Do not assume that OpenCL framework is always used in Apple 2022-11-20 14:19:27 -06:00
Kitware Robot 55c7a1f1ad CMake Nightly Date Stamp 2022-11-20 00:01:07 -05:00
Peter Würth 26d813092b add_custom_{command,target}: add genex support for COMMENT
Evaluate and expand generator expressions in the `COMMENT` argument of
the `add_custom_command()` and `add_custom_target()` commands.
This allows to include generator expressions, e.g. a targets location
$<TARGET_...> or the current configuration $<CONFIG>, in the build-time
messages.

Fixes #22507
2022-11-19 13:32:56 +01:00
Peter Würth 60a5a39022 cmCustomCommandGenerator: refactor GetComment to return std::string
Refactoring was done because EvaluateComment leaked memory.
2022-11-19 13:32:56 +01:00
Kitware Robot d8c8e61633 CMake Nightly Date Stamp 2022-11-19 00:01:10 -05:00
Oleksii Udod 3ddfdc38eb FindCUDA: Do not use CUDA_nppicom_LIBRARY in CUDA 11.0+
Extend the change from commit 1d9f2f9714 (FindCUDA: Do not search for
the deprecated nppicom when CUDA >= 11, 2020-06-22, v3.18.0-rc3~14^2)
to also not use the `CUDA_nppicom_LIBRARY` variable.

Issue: #20845
2022-11-18 15:25:05 -05:00
Russell Greene b99c386122 Xcode: Allow bundling extensionkit extensions
Fixes: #24150
2022-11-18 13:58:03 -06:00