summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2007-06-28 13:09:26 (GMT)
committerAlexander Neundorf <neundorf@kde.org>2007-06-28 13:09:26 (GMT)
commit43de8c862868be38ce5ffe91edf09898ef8478cf (patch)
tree90a54e2fc57511c61b271a9bd6e01f6b4096d35a /Source/cmMakefile.cxx
parent53f39ad566ec7b9b3c118164d5330c0d17dd18c1 (diff)
downloadCMake-43de8c862868be38ce5ffe91edf09898ef8478cf.zip
CMake-43de8c862868be38ce5ffe91edf09898ef8478cf.tar.gz
CMake-43de8c862868be38ce5ffe91edf09898ef8478cf.tar.bz2
ENH: add OPTIONAL keyword to ENABLE_LANGUAGE, so it will be possible to do
something like this: ENABLE_LANGUAGE(ASM-ATT) IF(CMAKE_ASM-ATT_COMPILER_WORKS) ... do assembler stufff ELSE(CMAKE_ASM-ATT_COMPILER_WORKS) ... fallback to generic C/C++ ENDIF(CMAKE_ASM-ATT_COMPILER_WORKS) Alex
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3c0078f..0487313 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2150,11 +2150,13 @@ cmSourceFile* cmMakefile::GetOrCreateSource(const char* sourceName,
}
}
-void cmMakefile::EnableLanguage(std::vector<std::string> const & lang)
+void cmMakefile::EnableLanguage(std::vector<std::string> const & lang,
+ bool optional)
{
this->AddDefinition("CMAKE_CFG_INTDIR",
- this->LocalGenerator->GetGlobalGenerator()->GetCMakeCFGInitDirectory());
- this->LocalGenerator->GetGlobalGenerator()->EnableLanguage(lang, this);
+ this->LocalGenerator->GetGlobalGenerator()->GetCMakeCFGInitDirectory());
+ this->LocalGenerator->GetGlobalGenerator()->EnableLanguage(lang, this,
+ optional);
}
void cmMakefile::ExpandSourceListArguments(