This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 00340d929ffb8986aa9349137149ae0edd28b60e (commit)
via f7e5c6820a6eed8e6f29f7a5634a30b4f42a43aa (commit)
from 3cffa4c58ecdeaf44d05124a6cc2799205ca9670 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00340d929ffb8986aa9349137149ae0edd28b60e
commit 00340d929ffb8986aa9349137149ae0edd28b60e
Merge: 3cffa4c f7e5c68
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Feb 14 13:38:29 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Feb 14 13:38:29 2017 -0500
Merge topic 'vs-dedup-tag' into next
f7e5c682 VS: De-duplicate PreprocessorDefinitions tag name
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7e5c6820a6eed8e6f29f7a5634a30b4f42a43aa
commit f7e5c6820a6eed8e6f29f7a5634a30b4f42a43aa
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 10 14:23:08 2017 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Feb 14 13:37:54 2017 -0500
VS: De-duplicate PreprocessorDefinitions tag name
Store the name in a variable for re-use.
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx
b/Source/cmVisualStudioGeneratorOptions.cxx
index c0913e6..6bacfa1 100644
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@ -252,19 +252,19 @@ void
cmVisualStudioGeneratorOptions::OutputPreprocessorDefinitions(
if (this->Defines.empty()) {
return;
}
+ const char* tag = "PreprocessorDefinitions";
if (this->Version >= cmGlobalVisualStudioGenerator::VS10) {
// if there are configuration specific flags, then
// use the configuration specific tag for PreprocessorDefinitions
if (!this->Configuration.empty()) {
fout << prefix;
this->TargetGenerator->WritePlatformConfigTag(
- "PreprocessorDefinitions", this->Configuration.c_str(), 0, 0, 0,
- &fout);
+ tag, this->Configuration.c_str(), 0, 0, 0, &fout);
} else {
- fout << prefix << "<PreprocessorDefinitions>";
+ fout << prefix << "<" << tag << ">";
}
} else {
- fout << prefix << "PreprocessorDefinitions=\"";
+ fout << prefix << tag << "=\"";
}
const char* sep = "";
for (std::vector<std::string>::const_iterator di = this->Defines.begin();
@@ -291,7 +291,7 @@ void
cmVisualStudioGeneratorOptions::OutputPreprocessorDefinitions(
sep = ";";
}
if (this->Version >= cmGlobalVisualStudioGenerator::VS10) {
- fout << ";%(PreprocessorDefinitions)</PreprocessorDefinitions>" << suffix;
+ fout << ";%(" << tag << ")</" << tag << ">" << suffix;
} else {
fout << "\"" << suffix;
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmVisualStudioGeneratorOptions.cxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
