diff options
| author | Craig Scott <craig.scott@crascit.com> | 2023-02-24 06:10:38 (GMT) |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2023-02-24 06:17:36 (GMT) |
| commit | c15674a9cb0f8c6d432a52ac6fb724cc85f68034 (patch) | |
| tree | 7a0dbed535916592d90111370edc175ee16e90ce /Tests/RunCMake/FetchContent | |
| parent | 31ef93f19ff9c1529024ab5e9b82143b99ef1c70 (diff) | |
| download | CMake-c15674a9cb0f8c6d432a52ac6fb724cc85f68034.zip CMake-c15674a9cb0f8c6d432a52ac6fb724cc85f68034.tar.gz CMake-c15674a9cb0f8c6d432a52ac6fb724cc85f68034.tar.bz2 | |
FetchContent: Reject CMAKE_TOOLCHAIN_FILE env var in sub-build
The sub-build should never try to use a toolchain file. The toolchain file
may itself be getting downloaded by FetchContent. If the
CMAKE_TOOLCHAIN_FILE environment variable is set, CMake uses it to
initialize the CMake variable of the same name. We need to explicitly
clear them before the first project call of the sub-build.
Fixes: #24535
Diffstat (limited to 'Tests/RunCMake/FetchContent')
| -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 0000000..f8ee749 --- /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 bb27491..3781089 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) |