diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-06-28 13:09:26 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-06-28 13:09:26 (GMT) |
| commit | 43de8c862868be38ce5ffe91edf09898ef8478cf (patch) | |
| tree | 90a54e2fc57511c61b271a9bd6e01f6b4096d35a /Source/cmGlobalMSYSMakefileGenerator.cxx | |
| parent | 53f39ad566ec7b9b3c118164d5330c0d17dd18c1 (diff) | |
| download | CMake-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/cmGlobalMSYSMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalMSYSMakefileGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx index 0c76625..084d85b 100644 --- a/Source/cmGlobalMSYSMakefileGenerator.cxx +++ b/Source/cmGlobalMSYSMakefileGenerator.cxx @@ -50,7 +50,9 @@ cmGlobalMSYSMakefileGenerator::FindMinGW(std::string const& makeloc) } void cmGlobalMSYSMakefileGenerator -::EnableLanguage(std::vector<std::string>const& l, cmMakefile *mf) +::EnableLanguage(std::vector<std::string>const& l, + cmMakefile *mf, + bool optional) { this->FindMakeProgram(mf); std::string makeProgram = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"); @@ -75,7 +77,7 @@ void cmGlobalMSYSMakefileGenerator mf->AddDefinition("MSYS", "1"); mf->AddDefinition("CMAKE_GENERATOR_CC", gcc.c_str()); mf->AddDefinition("CMAKE_GENERATOR_CXX", gxx.c_str()); - this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf); + this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional); if(!mf->IsSet("CMAKE_AR") && !this->CMakeInstance->GetIsInTryCompile()) { cmSystemTools::Error |