summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2008-05-12 22:33:08 (GMT)
committerAlexander Neundorf <neundorf@kde.org>2008-05-12 22:33:08 (GMT)
commit4ce05b6e07370ad07fe90139e7729f3004d7587a (patch)
tree45587ff68a476ee7597211ded0395934bbc223a5
parent83c3bf7accfb1b28b95dca6225a9fadee3b09b2a (diff)
downloadCMake-4ce05b6e07370ad07fe90139e7729f3004d7587a.zip
CMake-4ce05b6e07370ad07fe90139e7729f3004d7587a.tar.gz
CMake-4ce05b6e07370ad07fe90139e7729f3004d7587a.tar.bz2
BUG: make ENABLE_LANGUAGE(ASM-ATT OPTIONAL) work again: if it didn't work
but was optional, don't delete the cache Alex
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index e2512c9..43d97b3 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -90,7 +90,7 @@ void cmGlobalUnixMakefileGenerator3
const char* cname = this->GetCMakeInstance()->
GetCacheManager()->GetCacheValue(langComp.c_str());
std::string changeVars;
- if(cname && (path != cname))
+ if(cname && (path != cname) && (optional==false))
{
const char* cvars =
this->GetCMakeInstance()->GetProperty(