forked from pool/opencv
ade761eb52
1 OBS-URL: https://build.opensuse.org/request/show/304684 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=55
16 lines
705 B
Diff
16 lines
705 B
Diff
Index: opencv-2.4.11/cmake/OpenCVDetectCXXCompiler.cmake
|
|
===================================================================
|
|
--- opencv-2.4.11.orig/cmake/OpenCVDetectCXXCompiler.cmake
|
|
+++ opencv-2.4.11/cmake/OpenCVDetectCXXCompiler.cmake
|
|
@@ -68,6 +68,10 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
|
|
OUTPUT_VARIABLE CMAKE_OPENCV_GCC_VERSION_FULL
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
|
|
+ if (CMAKE_OPENCV_GCC_VERSION_FULL MATCHES "5")
|
|
+ set(CMAKE_OPENCV_GCC_VERSION_FULL "5.0")
|
|
+ endif()
|
|
+
|
|
execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} -v
|
|
ERROR_VARIABLE CMAKE_OPENCV_GCC_INFO_FULL
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|