summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalUnixMakefileGenerator3.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/cmGlobalUnixMakefileGenerator3.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/cmGlobalUnixMakefileGenerator3.cxx')
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index ef6fa90..6945b0d 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -39,9 +39,11 @@ cmGlobalUnixMakefileGenerator3::cmGlobalUnixMakefileGenerator3()
}
void cmGlobalUnixMakefileGenerator3
-::EnableLanguage(std::vector<std::string>const& languages, cmMakefile *mf)
+::EnableLanguage(std::vector<std::string>const& languages,
+ cmMakefile *mf,
+ bool optional)
{
- this->cmGlobalGenerator::EnableLanguage(languages, mf);
+ this->cmGlobalGenerator::EnableLanguage(languages, mf, optional);
std::string path;
for(std::vector<std::string>::const_iterator l = languages.begin();
l != languages.end(); ++l)
@@ -70,7 +72,8 @@ void cmGlobalUnixMakefileGenerator3
{
path = name;
}
- if(path.size() == 0 || !cmSystemTools::FileExists(path.c_str()))
+ if((path.size() == 0 || !cmSystemTools::FileExists(path.c_str()))
+ && (optional==false))
{
std::string message = "your ";
message += lang;