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 /Tests | |
| 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 'Tests')
| -rw-r--r-- | Tests/RunCMake/FetchContent/IgnoreToolchainFile.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/FetchContent/RunCMakeTest.cmake | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Tests/RunCMake/FetchContent/IgnoreToolchainFile.cmake b/Tests/RunCMake/FetchContent/IgnoreToolchainFile.cmake new file mode 100644 index 0000000000..f8ee74995c --- /dev/null +++ b/Tests/RunCMake/FetchContent/IgnoreToolchainFile.cmake @@ -0,0 +1,2 @@ +set(ENV{CMAKE_TOOLCHAIN_FILE} path/to/somewhere/iDoNotExist.cmake) +include(DownloadFile.cmake) diff --git a/Tests/RunCMake/FetchContent/RunCMakeTest.cmake b/Tests/RunCMake/FetchContent/RunCMakeTest.cmake index bb27491b6b..378108991a 100644 --- a/Tests/RunCMake/FetchContent/RunCMakeTest.cmake +++ b/Tests/RunCMake/FetchContent/RunCMakeTest.cmake @@ -7,6 +7,7 @@ run_cmake(DirectIgnoresDetails) run_cmake(FirstDetailsWin) run_cmake(DownloadTwice) run_cmake(DownloadFile) +run_cmake(IgnoreToolchainFile) run_cmake(SameGenerator) run_cmake(System) run_cmake(VarDefinitions) |