summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-04-24 15:18:06 (GMT)
committerBrad King <brad.king@kitware.com>2009-04-24 15:18:06 (GMT)
commit708d1cf1ee9300bc9b9e26a47e1bbe1718612d6f (patch)
treeda8134e5e88176619d7ffc29ec010a9035540d5e /Source/cmMakefile.cxx
parent70b2f59c3f9c70c085966bacb1e8a41c3ad2947f (diff)
downloadCMake-708d1cf1ee9300bc9b9e26a47e1bbe1718612d6f.zip
CMake-708d1cf1ee9300bc9b9e26a47e1bbe1718612d6f.tar.gz
CMake-708d1cf1ee9300bc9b9e26a47e1bbe1718612d6f.tar.bz2
ENH: Support more preprocessor values in VS6
Previously we rejected all preprocessor definition values containing spaces for the VS6 IDE generator. In fact VS6 does support spaces but not in combination with '"', '$', or ';', and only if we use the sytnax '-DNAME="value with spaces"' instead of '-D"NAME=value with spaces"'. Now we support all definition values that do not have one of these invalid pairs. See issue #8779.
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index a0b536b..fc57276 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1216,10 +1216,11 @@ bool cmMakefile::ParseDefineFlag(std::string const& def, bool remove)
return false;
}
- // VS6 IDE does not support definition values with spaces.
+ // VS6 IDE does not support definition values with spaces in
+ // combination with '"', '$', or ';'.
if((strcmp(this->LocalGenerator->GetGlobalGenerator()->GetName(),
"Visual Studio 6") == 0) &&
- (def.find(" ") != def.npos))
+ (def.find(" ") != def.npos && def.find_first_of("\"$;") != def.npos))
{
return false;
}