[med-svn] [ginkgocadx] 04/06: New upstream version 3.8.7

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gewo pushed a commit to branch master
in repository ginkgocadx.

commit d6be7c04c32db459159e9528e96b6a8f81ebd40c
Author: Gert Wollny <gewo at debian.org>
Date:   Sun Sep 24 08:05:09 2017 +0000

    New upstream version 3.8.7
---
 CMakeLists.txt | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c67a35..b37af0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,10 +38,14 @@ IF (((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") AND
   MESSAGE(STATUS "Compiler has full c++11 support")
 
   # g++ >= 6.0 sets std=c++14 by default
-  IF ((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") AND
-      (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0.0))
+  IF (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+    IF (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0.0)
+      SET(CXX_11_FLAG "-std=c++11")
+    ENDIF()
+  ELSE()
     SET(CXX_11_FLAG "-std=c++11")
   ENDIF()
+  
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  ${CXX_11_FLAG}")
 ELSE()
   CHECK_CXX_COMPILER_FLAG("-std=c++11" HAS_GNU_CXX11_FLAG)
@@ -56,16 +60,6 @@ ELSE()
     ENDIF(HAS_GNU_CXX0X_FLAG)
   ENDIF(HAS_GNU_CXX11_FLAG)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  ${CXX_11_FLAG}")
-  INCLUDE (${CMAKE_CURRENT_SOURCE_DIR}/cmake/checkCpp0xAuto.cmake)
-  INCLUDE (${CMAKE_CURRENT_SOURCE_DIR}/cmake/checkCpp0xLambda.cmake)
-  IF(NOT "${CXX_HAS_CXX_0X_AUTO}" OR NOT CXX_HAS_CXX_0X_LAMBDA)
-    MESSAGE(FATAL_ERROR
-      "This source code requires the C++0x auto type and lambda features. "
-      "If your compiler is supposed to support this feature, "
-      "please enable the appropriate flags and delete the CMakeCache.txt file before "
-      "re-running cmake.\n"
-      "For g++ >= 4.8 this is '-std=c++0x' ")
-  ENDIF(NOT "${CXX_HAS_CXX_0X_AUTO}" OR NOT CXX_HAS_CXX_0X_LAMBDA)
 ENDIF()
 
 #doesn't work... using custom build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ginkgocadx.git