mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 20:00:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cmake-gui-cc-cxx-env'

Browse Source 
c3bd5a6a2c cmake-gui: Unset empty CC,CXX on global generator change

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6151
This commit is contained in:
Brad King
2021-05-25 14:03:32 +00:00
committed by Kitware Robot
parent bf2717e436 c3bd5a6a2c
commit 909b7a3eca
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmake.cxx
+6 -3
View File
@@ -1751,17 +1751,20 @@ void cmake::SetGlobalGenerator(std::unique_ptr<cmGlobalGenerator> gg)
}
if (this->GlobalGenerator) {
// restore the original environment variables CXX and CC
// Restore CC
std::string env = "CC=";
if (!this->CCEnvironment.empty()) {
env += this->CCEnvironment;
cmSystemTools::PutEnv(env);
} else {
cmSystemTools::UnPutEnv(env);
}
cmSystemTools::PutEnv(env);
env = "CXX=";
if (!this->CXXEnvironment.empty()) {
env += this->CXXEnvironment;
cmSystemTools::PutEnv(env);
} else {
cmSystemTools::UnPutEnv(env);
}
cmSystemTools::PutEnv(env);
}
// set the new