summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudioGeneratorOptions.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-06-28 19:51:13 (GMT)
committerBrad King <brad.king@kitware.com>2010-06-28 20:20:01 (GMT)
commit13ca4ef6656c2d06231e1966ff54a3943459e7e2 (patch)
tree89c2beb8e2a3f2992947cc05644b76ee4b97285e /Source/cmVisualStudioGeneratorOptions.cxx
parenta55aee5cddc00c33536c957ec4c7732a6083047c (diff)
downloadCMake-13ca4ef6656c2d06231e1966ff54a3943459e7e2.zip
CMake-13ca4ef6656c2d06231e1966ff54a3943459e7e2.tar.gz
CMake-13ca4ef6656c2d06231e1966ff54a3943459e7e2.tar.bz2
VS: Always separate preprocessor defs by semicolon (#10902)
Separation by ',' only works in VS 2008 and below and does not work in the PlayStation3 VS plugin. Separation by ';' works in VS 10 and all prior versions.
Diffstat (limited to 'Source/cmVisualStudioGeneratorOptions.cxx')
-rw-r--r--Source/cmVisualStudioGeneratorOptions.cxx13
1 files changed, 3 insertions, 10 deletions
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx
index 051cc1f..972af95 100644
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@ -183,7 +183,7 @@ cmVisualStudioGeneratorOptions
{
fout << prefix << "PreprocessorDefinitions=\"";
}
- const char* comma = "";
+ const char* sep = "";
for(std::vector<std::string>::const_iterator di = this->Defines.begin();
di != this->Defines.end(); ++di)
{
@@ -208,15 +208,8 @@ cmVisualStudioGeneratorOptions
define = cmVisualStudioGeneratorOptionsEscapeForXML(define.c_str());
}
// Store the flag in the project file.
- fout << comma << define;
- if(this->Version == 10)
- {
- comma = ";";
- }
- else
- {
- comma = ",";
- }
+ fout << sep << define;
+ sep = ";";
}
if(this->Version == 10)
{