[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-365-g6561f10

Stephen Kelly steveire at gmail.com
Tue Feb 17 02:39:50 EST 2015


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  6561f105fe1c8c5d262c501a086afca0508ca8af (commit)
       via  aaad0bf35263643c42ae715ef2621a9b1fbaed72 (commit)
      from  4607c510ae328a90efd2c7af6671315251333553 (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=6561f105fe1c8c5d262c501a086afca0508ca8af
commit 6561f105fe1c8c5d262c501a086afca0508ca8af
Merge: 4607c51 aaad0bf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 02:39:49 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 17 02:39:49 2015 -0500

    Merge topic 'fix-GNU-5.0-corruption' into next
    
    aaad0bf3 Work around bug in pre-release GNU CXX 5.0.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aaad0bf35263643c42ae715ef2621a9b1fbaed72
commit aaad0bf35263643c42ae715ef2621a9b1fbaed72
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 17 08:32:48 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 17 08:33:24 2015 +0100

    Work around bug in pre-release GNU CXX 5.0.

diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 3c053fa..5444062 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -72,6 +72,12 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^parisc")
   endif()
 endif()
 
+if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND
+    NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65085
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
+endif()
+
 if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")

-----------------------------------------------------------------------

Summary of changes:
 CompileFlags.cmake |    6 ++++++
 1 file changed, 6 insertions(+)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list