2016-03-05 10:21:23 +00:00
|
|
|
--- 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 @@
|
2015-05-10 08:53:32 +00:00
|
|
|
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)
|
