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 f26306d36f7fefcbb041587a6e432ceb4eeb6926 (commit)
via 11508b1a5d8fe5b7d136d0d75591a1e846cc2ca8 (commit)
via bb00d7cbca6e7a9f75a6c5094487b9c6468213f4 (commit)
from c58350078e22ec7706a0eae99ae2b57950f12328 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f26306d36f7fefcbb041587a6e432ceb4eeb6926
commit f26306d36f7fefcbb041587a6e432ceb4eeb6926
Merge: c583500 11508b1
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Jan 1 07:44:22 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jan 1 07:44:22 2015 -0500
Merge topic 'sun-better-stdlib' into next
11508b1a cmTarget: Use insert instead of std::copy.
bb00d7cb Workaround SolarisStudio bug with libstdc++.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11508b1a5d8fe5b7d136d0d75591a1e846cc2ca8
commit 11508b1a5d8fe5b7d136d0d75591a1e846cc2ca8
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Jan 1 13:35:18 2015 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Jan 1 13:43:40 2015 +0100
cmTarget: Use insert instead of std::copy.
insert can reserve() memory in the container, and this is
more-consistent with the rest of CMake now.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index c8fbf61..d454e89 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6058,8 +6058,8 @@ cmTargetInternals::ComputeLinkInterfaceLibraries(
// The link implementation is the default link interface.
cmTarget::LinkImplementationLibraries const* impl =
thisTarget->GetLinkImplementationLibrariesInternal(config, headTarget);
- std::copy(impl->Libraries.begin(), impl->Libraries.end(),
- std::back_inserter(iface.Libraries));
+ iface.Libraries.insert(iface.Libraries.end(),
+ impl->Libraries.begin(), impl->Libraries.end());
if(thisTarget->PolicyStatusCMP0022 == cmPolicies::WARN &&
!this->PolicyWarnedCMP0022 && !usage_requirements_only)
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb00d7cbca6e7a9f75a6c5094487b9c6468213f4
commit bb00d7cbca6e7a9f75a6c5094487b9c6468213f4
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Jan 1 12:54:50 2015 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Jan 1 13:43:40 2015 +0100
Workaround SolarisStudio bug with libstdc++.
Using iostream and cxxabi.h together causes a compile failure
.../CC-gcc/include/c++/4.8.2/cxxabi.h", line 131: Error: Only one of a set
of overloaded functions can be extern "C".
https://community.oracle.com/thread/3644901
This only happens if the iostream include is before the cxxabi include.
The available solutions are: re-order the includes in
kwsys/SystemInformation.cxx, skip the test for KWSYS_CXX_HAS_CXXABI, or
cause it to fail by adding the include.
Do the latter for now.
diff --git a/Source/kwsys/kwsysPlatformTestsCXX.cxx
b/Source/kwsys/kwsysPlatformTestsCXX.cxx
index 3f947f3..82620da 100644
--- a/Source/kwsys/kwsysPlatformTestsCXX.cxx
+++ b/Source/kwsys/kwsysPlatformTestsCXX.cxx
@@ -548,6 +548,10 @@ int main()
#if (defined(__GNUC__) || defined(__PGI)) && !defined(_GNU_SOURCE)
# define _GNU_SOURCE
#endif
+#if defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x5130 \
+ && __linux && __SUNPRO_CC_COMPAT == 'G'
+# include <iostream>
+#endif
#include <cxxabi.h>
int main()
{
-----------------------------------------------------------------------
Summary of changes:
Source/cmTarget.cxx | 4 ++--
Source/kwsys/kwsysPlatformTestsCXX.cxx | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
