c612742431
Update for opencv 3.1.0. Everything required for digikam is added and digikam is building OBS-URL: https://build.opensuse.org/request/show/365841 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=61
14 lines
617 B
Diff
14 lines
617 B
Diff
--- opencv-3.1.0.orig/cmake/OpenCVDetectCXXCompiler.cmake 2015-12-18 16:02:16.000000000 +0100
|
|
+++ opencv-3.1.0/cmake/OpenCVDetectCXXCompiler.cmake 2016-02-26 22:27:55.409007293 +0100
|
|
@@ -71,6 +71,10 @@
|
|
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)
|