diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-28 14:35:53 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-28 14:35:53 (GMT) |
| commit | 2699ac5ef727c824e22dc515149529783d8b9a8f (patch) | |
| tree | 2a9d8946bf110a61b8b6f294c0e9b83b64cf933f | |
| parent | fd0229e8c5bffa4807962dbe4e077ae7ac2d3dda (diff) | |
| parent | 8981513a810a97d10e299407e12c46aabe68f00a (diff) | |
| download | CMake-2699ac5ef727c824e22dc515149529783d8b9a8f.zip CMake-2699ac5ef727c824e22dc515149529783d8b9a8f.tar.gz CMake-2699ac5ef727c824e22dc515149529783d8b9a8f.tar.bz2 | |
Merge topic 'fix-re-cmake-with-compiler'
8981513a CMakeDetermineCompiler: Simplify CMAKE_<LANG>_COMPILER default force-cache
731427a6 cmGlobalGenerator: Do not re-add CMAKE_<LANG>_COMPILER
| -rw-r--r-- | Modules/CMakeDetermineCompiler.cmake | 2 | ||||
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Modules/CMakeDetermineCompiler.cmake b/Modules/CMakeDetermineCompiler.cmake index cd0f8b8..0ab3af6 100644 --- a/Modules/CMakeDetermineCompiler.cmake +++ b/Modules/CMakeDetermineCompiler.cmake @@ -65,7 +65,7 @@ macro(_cmake_find_compiler lang) endif() find_program(CMAKE_${lang}_COMPILER NAMES ${CMAKE_${lang}_COMPILER_LIST} DOC "${lang} compiler") if(CMAKE_${lang}_COMPILER_INIT AND NOT CMAKE_${lang}_COMPILER) - set(CMAKE_${lang}_COMPILER "${CMAKE_${lang}_COMPILER_INIT}" CACHE FILEPATH "${lang} compiler" FORCE) + set_property(CACHE CMAKE_${lang}_COMPILER PROPERTY VALUE "${CMAKE_${lang}_COMPILER_INIT}") endif() unset(_${lang}_COMPILER_HINTS) unset(_languages) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index ae6861e..249373c 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -148,8 +148,6 @@ void cmGlobalGenerator::ResolveLanguageCompiler(const std::string &lang, { return; } - std::string doc = lang; - doc += " compiler."; const char* cname = this->GetCMakeInstance()-> GetCacheManager()->GetCacheValue(langComp); std::string changeVars; @@ -186,8 +184,6 @@ void cmGlobalGenerator::ResolveLanguageCompiler(const std::string &lang, changeVars.c_str()); } } - mf->AddCacheDefinition(langComp, path.c_str(), - doc.c_str(), cmCacheManager::FILEPATH); } void cmGlobalGenerator::AddBuildExportSet(cmExportBuildFileGenerator* gen) |