mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-28 19:58:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'env-toolchain-file'

Browse Source 
6c34ed9b87 cmake: Allow CMAKE_TOOLCHAIN_FILE to be set by environment variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6188
This commit is contained in:
Brad King
2021-06-04 11:00:37 +00:00
committed by Kitware Robot
parent c61782917d 6c34ed9b87
commit 26e75b474b
17 changed files with 86 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmake.cxx
View File

@@ -2040,6 +2040,16 @@ int cmake::ActualConfigure()
this->GlobalGenerator->GetExtraGeneratorName().c_str(),
"Name of external makefile project generator.",
cmStateEnums::INTERNAL);
if (!this->State->GetInitializedCacheValue("CMAKE_TOOLCHAIN_FILE")) {
std::string envToolchain;
if (cmSystemTools::GetEnv("CMAKE_TOOLCHAIN_FILE", envToolchain) &&
!envToolchain.empty()) {
this->AddCacheEntry("CMAKE_TOOLCHAIN_FILE", envToolchain.c_str(),
"The CMake toolchain file",
cmStateEnums::FILEPATH);
}
}
}
if (cmProp instance =