kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmake: Get enabled languages from cmState. 

The check for a global generator is redundant - the enabled
languages are only populated by the global generator.
This commit is contained in:
Stephen Kelly 2015-04-11 14:16:44 +02:00
parent 74de9a734c
commit db8425be18
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmake.cxx
View File

@ -2343,14 +2343,9 @@ const char *cmake::GetProperty(const std::string& prop,
} }
else if ( prop == "ENABLED_LANGUAGES" ) else if ( prop == "ENABLED_LANGUAGES" )
{ {
std::string lang; std::string langs;
if(this->GlobalGenerator) langs = cmJoin(this->State->GetEnabledLanguages(), ";");
{ this->SetProperty("ENABLED_LANGUAGES", langs.c_str());
std::vector<std::string> enLangs;
this->GlobalGenerator->GetEnabledLanguages(enLangs);
lang = cmJoin(enLangs, ";");
}
this->SetProperty("ENABLED_LANGUAGES", lang.c_str());
} }
#define STRING_LIST_ELEMENT(F) ";" #F #define STRING_LIST_ELEMENT(F) ";" #F
if (prop == "CMAKE_C_KNOWN_FEATURES") if (prop == "CMAKE_C_KNOWN_FEATURES")