summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2007-06-11 19:47:35 (GMT)
committerAlexander Neundorf <neundorf@kde.org>2007-06-11 19:47:35 (GMT)
commit6c02ec1a400c1eca86901a275c46d7a1ec12af27 (patch)
tree13ae44abd6f07afb01d2eb371a6fc945acf9efef
parented1a04360afaae3d752cd99346856d484ba42f7f (diff)
downloadCMake-6c02ec1a400c1eca86901a275c46d7a1ec12af27.zip
CMake-6c02ec1a400c1eca86901a275c46d7a1ec12af27.tar.gz
CMake-6c02ec1a400c1eca86901a275c46d7a1ec12af27.tar.bz2
STYLE: add a comment about SetLanguageEnabled()
-add a Generic.cmake for target platforms without operating system Alex
-rw-r--r--Modules/Platform/Generic.cmake8
-rw-r--r--Source/cmGlobalGenerator.cxx7
2 files changed, 15 insertions, 0 deletions
diff --git a/Modules/Platform/Generic.cmake b/Modules/Platform/Generic.cmake
new file mode 100644
index 0000000..fdced24
--- /dev/null
+++ b/Modules/Platform/Generic.cmake
@@ -0,0 +1,8 @@
+# This is a platform definition file for platforms without
+# operating system, typically embedded platforms.
+# It is used when CMAKE_SYSTEM_NAME is set to "Generic"
+#
+# It is intentionally empty, since nothing is known
+# about the platform. So everything has to be specified
+# in the system/compiler files ${CMAKE_SYSTEM_NAME}-<compiler_basename>.cmake
+# and/or ${CMAKE_SYSTEM_NAME}-<compiler_basename>-${CMAKE_SYSTEM_PROCESSOR}.cmake
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 907752d..db50def 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -534,6 +534,13 @@ const char* cmGlobalGenerator::GetLanguageFromExtension(const char* ext)
return 0;
}
+/* SetLanguageEnabled() is now split in two parts:
+at first the enabled-flag is set. This can then be used in EnabledLanguage()
+for checking whether the language is already enabled. After setting this
+flag still the values from the cmake variables have to be copied into the
+internal maps, this is done in SetLanguageEnabledMaps() which is called
+after the system- and compiler specific files have been loaded.
+*/
void cmGlobalGenerator::SetLanguageEnabled(const char* l, cmMakefile* mf)
{
this->SetLanguageEnabledFlag(l, mf);