diff options
| author | Craig Scott <craig.scott@crascit.com> | 2023-02-25 22:16:15 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-02-25 17:16:37 -0500 |
| commit | 57f09a818cabf5a9eb00a8269f5d42e65f0af625 (patch) | |
| tree | 7dd21e85bc6b82ec0b3c82d50193b84a8c1a87f3 /Modules/FetchContent.cmake | |
| parent | 85c77f059b11e6ae56b9212b0a469eaf7768395d (diff) | |
| parent | c15674a9cb0f8c6d432a52ac6fb724cc85f68034 (diff) | |
| download | cmake-57f09a818cabf5a9eb00a8269f5d42e65f0af625.tar.gz | |
Merge topic 'fetchcontent-reject-CMAKE_TOOLCHAIN_FILE-env-var'
c15674a9cb FetchContent: Reject CMAKE_TOOLCHAIN_FILE env var in sub-build
31ef93f19f FetchContent: Only use @-@ replacements for sub-build CMakeLists.txt
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8248
Diffstat (limited to 'Modules/FetchContent.cmake')
| -rw-r--r-- | Modules/FetchContent.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FetchContent.cmake b/Modules/FetchContent.cmake index a6250cc211..dd5f617acd 100644 --- a/Modules/FetchContent.cmake +++ b/Modules/FetchContent.cmake @@ -1598,7 +1598,9 @@ set_property(GLOBAL PROPERTY _CMAKE_FindGit_GIT_EXECUTABLE_VERSION # has this set to something not findable on the PATH. We also ensured above # that the Debug config will be defined for multi-config generators. configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/FetchContent/CMakeLists.cmake.in" - "${ARG_SUBBUILD_DIR}/CMakeLists.txt") + "${ARG_SUBBUILD_DIR}/CMakeLists.txt" + @ONLY + ) execute_process( COMMAND ${CMAKE_COMMAND} ${subCMakeOpts} . RESULT_VARIABLE result |