Add C++11 -Wno-deprecated-register only to clang versions with support

qgis · Feb 18, 2015 · 9a75c9e · 9a75c9e
1 parent 39d3765
commit 9a75c9e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -330,8 +330,12 @@ ELSEIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
   IF ((NOT APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "3.2")
        OR (APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.1"))
     SET(USE_CXX_11 TRUE)
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-error=c++11-narrowing")
     #deprecated-register breaks Travis builds
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-error=c++11-narrowing -Wno-deprecated-register")
+    IF ((NOT APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "3.3")
+         OR (APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "5.0"))
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register")
+    ENDIF()
   ENDIF()
 ELSE()
   SET(USE_CXX_11 FALSE)