فهرست منبع

HPCC-14564 Disable -std=c++11 for eclrtl.cpp when on debian and boost < 1.48

Signed-off-by: Mark Kelly <mark.kelly@lexisnexis.com>
Mark Kelly 9 سال پیش
والد
کامیت
0e7071c30d
2فایلهای تغییر یافته به همراه6 افزوده شده و 4 حذف شده
  1. 2 2
      cmake_modules/commonSetup.cmake
  2. 4 2
      rtl/eclrtl/CMakeLists.txt

+ 2 - 2
cmake_modules/commonSetup.cmake

@@ -513,8 +513,8 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
       ENDIF()
 
       IF (CMAKE_COMPILER_IS_GNUCXX)
-        IF ("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.1.1")
-          MESSAGE(FATAL_ERROR "You need Gnu c++ version 4.1.1 or later to build this project (version ${CMAKE_CXX_COMPILER_VERSION} detected)")
+        IF ("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.7.3")
+          MESSAGE(FATAL_ERROR "You need Gnu c++ version 4.7.3 or later to build this project (version ${CMAKE_CXX_COMPILER_VERSION} detected)")
         ENDIF()
       ENDIF()
     ENDIF()

+ 4 - 2
rtl/eclrtl/CMakeLists.txt

@@ -52,9 +52,7 @@ set (    SRCS
          rtlread_imp.hpp
          rtlsize.hpp
          rtltype.hpp
-
          rtlbcdtest.cpp 
-
     )
 
 include_directories ( 
@@ -70,6 +68,10 @@ include_directories (
 
 ADD_DEFINITIONS( -D_USRDLL -DECLRTL_EXPORTS )
 
+if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
+    set_source_files_properties(eclrtl.cpp PROPERTIES COMPILE_FLAGS -std=c++98)
+endif ()
+
 if (WIN32)
 else ()
     ADD_DEFINITIONS( -DBOOST_DYN_LINK )