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/cmGlobalVisualStudio6Generator.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/cmGlobalVisualStudio6Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio6Generator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx index 2ed4f40..b980aa2 100644 --- a/Source/cmGlobalVisualStudio6Generator.cxx +++ b/Source/cmGlobalVisualStudio6Generator.cxx @@ -25,7 +25,9 @@ cmGlobalVisualStudio6Generator::cmGlobalVisualStudio6Generator() } void cmGlobalVisualStudio6Generator -::EnableLanguage(std::vector<std::string>const& lang, cmMakefile *mf) +::EnableLanguage(std::vector<std::string>const& lang, + cmMakefile *mf, + bool options) { mf->AddDefinition("CMAKE_GENERATOR_CC", "cl"); mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl"); @@ -34,7 +36,7 @@ void cmGlobalVisualStudio6Generator mf->AddDefinition("CMAKE_GENERATOR_Fortran", "ifort"); mf->AddDefinition("MSVC60", "1"); this->GenerateConfigurations(mf); - this->cmGlobalGenerator::EnableLanguage(lang, mf); + this->cmGlobalGenerator::EnableLanguage(lang, mf, optional); } void cmGlobalVisualStudio6Generator::GenerateConfigurations(cmMakefile* mf) |