do not use unsupported -mssse3 -msse4.1 flags with old GCC versions

git-svn-id: https://code.ros.org/svn/opencv/trunk@2801 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index cdaf81f096faf942975889b3cd8742864e670410..44bef4c6cf4685c0f1b8e0351ed7b4e28478a921 100644 (file)
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -142,9 +142,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 \r
     list(GET CMAKE_OPENCV_GCC_VERSIONS 0 CMAKE_OPENCV_GCC_VERSION_MAJOR)\r
     list(GET CMAKE_OPENCV_GCC_VERSIONS 1 CMAKE_OPENCV_GCC_VERSION_MINOR)\r
-\r
+    \r
     set(CMAKE_OPENCV_GCC_VERSION ${CMAKE_OPENCV_GCC_VERSION_MAJOR}${CMAKE_OPENCV_GCC_VERSION_MINOR})\r
-    message(STATUS "Detected version of GNU GCC: ${CMAKE_OPENCV_GCC_VERSION}")\r
+    math(EXPR CMAKE_OPENCV_GCC_VERSION_NUM "${CMAKE_OPENCV_GCC_VERSION_MAJOR}*100 + ${CMAKE_OPENCV_GCC_VERSION_MINOR}")\r
+    message(STATUS "Detected version of GNU GCC: ${CMAKE_OPENCV_GCC_VERSION} (${CMAKE_OPENCV_GCC_VERSION_NUM})")\r
 endif()\r
 \r
 # ----------------------------------------------------------------------------\r
@@ -737,12 +738,17 @@ if(CMAKE_COMPILER_IS_GNUCXX)
        if(ENABLE_SSE3)\r
           set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse3")\r
        endif()\r
-       if(ENABLE_SSSE3)\r
-          set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mssse3")\r
+       if(${CMAKE_OPENCV_GCC_VERSION_NUM} GREATER 402)\r
+          set(HAVE_GCC43_OR_NEWER 1)\r
+       endif()\r
+       if(HAVE_GCC43_OR_NEWER OR APPLE)\r
+          if(ENABLE_SSSE3)\r
+             set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mssse3")\r
+          endif()\r
+          if(ENABLE_SSE4_1)\r
+             set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse4.1")\r
+          endif()\r
        endif()\r
-       if(ENABLE_SSE4_1)\r
-          set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse4.1")\r
-       endif()      \r
     endif()\r
     \r
     if(X86 OR X86_64)\r