diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-11 12:16:44 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-13 18:27:36 (GMT) |
| commit | db8425be18439c899c08294dde117cc137c75d23 (patch) | |
| tree | df00abdcbbb4d074f58d720c6bdc1b9dec8875d2 /Source/cmake.cxx | |
| parent | 74de9a734c92288fb3e602be0d1c967b33b67443 (diff) | |
| download | CMake-db8425be18439c899c08294dde117cc137c75d23.zip CMake-db8425be18439c899c08294dde117cc137c75d23.tar.gz CMake-db8425be18439c899c08294dde117cc137c75d23.tar.bz2 | |
cmake: Get enabled languages from cmState.
The check for a global generator is redundant - the enabled
languages are only populated by the global generator.
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 6adecee..94b0ae0 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -2343,14 +2343,9 @@ const char *cmake::GetProperty(const std::string& prop, } else if ( prop == "ENABLED_LANGUAGES" ) { - std::string lang; - if(this->GlobalGenerator) - { - std::vector<std::string> enLangs; - this->GlobalGenerator->GetEnabledLanguages(enLangs); - lang = cmJoin(enLangs, ";"); - } - this->SetProperty("ENABLED_LANGUAGES", lang.c_str()); + std::string langs; + langs = cmJoin(this->State->GetEnabledLanguages(), ";"); + this->SetProperty("ENABLED_LANGUAGES", langs.c_str()); } #define STRING_LIST_ELEMENT(F) ";" #F if (prop == "CMAKE_C_KNOWN_FEATURES") |