summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-04-30 12:56:48 (GMT)
committerBrad King <brad.king@kitware.com>2015-04-30 13:08:25 (GMT)
commit27343e3b68e0aa0c923f1ad666575ed40efed211 (patch)
treeadd7cd98b056ce82feb5d47e2dc9cc5a3629fae0 /Source/cmGlobalGenerator.h
parent8469b6f6941ec8afe30f6c5a94f045e596bfe22a (diff)
downloadCMake-27343e3b68e0aa0c923f1ad666575ed40efed211.zip
CMake-27343e3b68e0aa0c923f1ad666575ed40efed211.tar.gz
CMake-27343e3b68e0aa0c923f1ad666575ed40efed211.tar.bz2
cmGlobalGenerator: Finish storing enabled languages in cmState
In commit 74de9a73 (cmGlobalGenerator: Delegate storage of enabled languages to cmState, 2015-04-11) the original LanguageEnabled member of cmGlobalGenerator was left behind by mistake. One use of it in EnableLanguagesFromGenerator (for try_compile) was left, but the member is not populated anymore. Drop the member and teach EnableLanguagesFromGenerator to copy the list of enabled languages from one cmState to the other. Reported-by: Matt McCormick <matt.mccormick@kitware.com>
Diffstat (limited to 'Source/cmGlobalGenerator.h')
-rw-r--r--Source/cmGlobalGenerator.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index ce3f037..ef1865f 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -441,7 +441,6 @@ private:
// If you add a new map here, make sure it is copied
// in EnableLanguagesFromGenerator
std::map<std::string, bool> IgnoreExtensions;
- std::vector<std::string> LanguageEnabled;
std::set<std::string> LanguagesReady; // Ready for try_compile
std::map<std::string, std::string> OutputExtensions;
std::map<std::string, std::string> LanguageToOutputExtension;