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 af6f3004dcf83123b3d12cf7446edb51bbec1b14 (commit)
via 2c7bc60834cde0c0e5eff03db092c341dfac78b7 (commit)
from ab65a1e18599219c644889c4d4cb1b45c0dc8383 (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=af6f3004dcf83123b3d12cf7446edb51bbec1b14
commit af6f3004dcf83123b3d12cf7446edb51bbec1b14
Merge: ab65a1e 2c7bc60
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Oct 6 16:44:59 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Oct 6 16:44:59 2016 -0400
Merge topic 'CMP0065-LINK_FLAGS' into next
2c7bc608 fixup! CMP0065: Put computed flags into LINK_FLAGS not
LINK_LIBRARIES
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c7bc60834cde0c0e5eff03db092c341dfac78b7
commit 2c7bc60834cde0c0e5eff03db092c341dfac78b7
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Oct 6 22:44:41 2016 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Oct 6 22:44:41 2016 +0200
fixup! CMP0065: Put computed flags into LINK_FLAGS not LINK_LIBRARIES
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index a0ff824..3fabd53 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1438,6 +1438,8 @@ void cmLocalGenerator::OutputLinkLibraries(std::string&
linkLibraries,
std::string linkLanguage = cli.GetLinkLanguage();
+ std::string linkLibs;
+
std::string libPathFlag =
this->Makefile->GetRequiredDefinition("CMAKE_LIBRARY_PATH_FLAG");
std::string libPathTerminator =
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalGenerator.cxx | 2 ++
1 file changed, 2 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
