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 e35490d722241d1646b25642b80187b4d658fea9 (commit)
via eda0e5f604dbaeacfe069c043ea9625581411214 (commit)
from 4abb02ace6738cfe46ab4696701232fa99b67297 (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=e35490d722241d1646b25642b80187b4d658fea9
commit e35490d722241d1646b25642b80187b4d658fea9
Merge: 4abb02a eda0e5f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue May 24 16:41:18 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue May 24 16:41:18 2016 -0400
Merge topic 'standard-include-directories' into next
eda0e5f6 fixup! Add a variable to specify language-wide system include
directories
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eda0e5f604dbaeacfe069c043ea9625581411214
commit eda0e5f604dbaeacfe069c043ea9625581411214
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue May 24 16:40:28 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue May 24 16:40:35 2016 -0400
fixup! Add a variable to specify language-wide system include directories
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 842876d..8859172 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2420,7 +2420,12 @@ std::vector<std::string>
cmGeneratorTarget::GetIncludeDirectories(
"CMAKE_" + lang + "_STANDARD_INCLUDE_DIRECTORIES";
std::string const standardIncludes =
this->Makefile->GetSafeDefinition(standardIncludesVar);
+ std::vector<std::string>::size_type const before = includes.size();
cmSystemTools::ExpandListArgument(standardIncludes, includes);
+ for (std::vector<std::string>::iterator i = includes.begin() + before;
+ i != includes.end(); ++i) {
+ cmSystemTools::ConvertToUnixSlashes(*i);
+ }
return includes;
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorTarget.cxx | 5 +++++
1 file changed, 5 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
