summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalXCodeGenerator.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/cmGlobalXCodeGenerator.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/cmGlobalXCodeGenerator.cxx')
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 6c6299f..7a66cf5 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -104,7 +104,7 @@ cmGlobalGenerator* cmGlobalXCodeGenerator::New()
//----------------------------------------------------------------------------
void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const&
lang,
- cmMakefile * mf)
+ cmMakefile * mf, bool optional)
{
mf->AddDefinition("XCODE","1");
if(this->XcodeVersion == 15)
@@ -125,7 +125,7 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const&
mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");
// initialize Architectures so it can be used by
// GetTargetObjectFileDirectories
- this->cmGlobalGenerator::EnableLanguage(lang, mf);
+ this->cmGlobalGenerator::EnableLanguage(lang, mf, optional);
const char* osxArch =
mf->GetDefinition("CMAKE_OSX_ARCHITECTURES");
const char* sysroot =