[Cmake-commits] CMake branch, next, updated. v3.1.0-1558-ge74ca40

[Stephen Kelly]

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  e74ca4050fc64514c0f3bf43027435692afcc9e7 (commit)
       via  70afd657ebb9c578502bedce52b450d604eed1c8 (commit)
      from  5813172221d7e1c19f458dae00fdfa5b19a7df77 (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=e74ca4050fc64514c0f3bf43027435692afcc9e7
commit e74ca4050fc64514c0f3bf43027435692afcc9e7
Merge: 5813172 70afd65
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 8 15:53:19 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 8 15:53:19 2015 -0500

    Merge topic 'sun-better-stdlib' into next
    
    70afd657 fixup! SolarisStudio: Use alternative standard library to build CMake.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70afd657ebb9c578502bedce52b450d604eed1c8
commit 70afd657ebb9c578502bedce52b450d604eed1c8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 8 21:40:52 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jan 8 21:41:01 2015 +0100

    fixup! SolarisStudio: Use alternative standard library to build CMake.
    
    Move the flag setting into CompileFlags.cmake.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f383d4..1812b27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,14 +44,6 @@ if(NOT DEFINED CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD 14)
 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")
-  else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4")
-  endif()
-endif()
-
 # option to set the internal encoding of CMake to UTF-8
 option(CMAKE_ENCODING_UTF8 "Use UTF-8 encoding internally (experimental)." OFF)
 mark_as_advanced(CMAKE_ENCODING_UTF8)
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index e7beb3f..b6cc783 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -75,6 +75,14 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^parisc")
   endif()
 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")
+  else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4")
+  endif()
+endif()
+
 # use the ansi CXX compile flag for building cmake
 if (CMAKE_ANSI_CXXFLAGS)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_ANSI_CXXFLAGS}")

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

Summary of changes:
 CMakeLists.txt     |    8 --------
 CompileFlags.cmake |    8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake