2017-11-19 11:08:51 +01:00
|
|
|
--- opencv-3.3.0.orig/CMakeLists.txt 2017-05-28 15:04:38.466895124 +0200
|
|
|
|
+++ opencv-3.3.0/CMakeLists.txt 2017-05-28 15:05:23.251389916 +0200
|
2017-06-12 15:13:03 +02:00
|
|
|
@@ -843,11 +843,11 @@
|
|
|
|
status(" Timestamp:" ${TIMESTAMP})
|
|
|
|
endif()
|
|
|
|
endif()
|
2016-01-28 17:18:35 +01:00
|
|
|
-status(" Host:" ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_VERSION} ${CMAKE_HOST_SYSTEM_PROCESSOR})
|
|
|
|
+status(" Host:" "Linux")
|
|
|
|
if(CMAKE_CROSSCOMPILING)
|
|
|
|
status(" Target:" ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR})
|
|
|
|
endif()
|
|
|
|
-status(" CMake:" ${CMAKE_VERSION})
|
|
|
|
+status(" CMake:" "YES")
|
|
|
|
status(" CMake generator:" ${CMAKE_GENERATOR})
|
|
|
|
status(" CMake build tool:" ${CMAKE_BUILD_TOOL})
|
|
|
|
if(MSVC)
|
2017-11-19 11:08:51 +01:00
|
|
|
--- opencv-3.3.0.orig/cmake/OpenCVUtils.cmake 2016-12-23 13:54:44.000000000 +0100
|
|
|
|
+++ opencv-3.3.0/cmake/OpenCVUtils.cmake 2017-05-28 15:07:42.728928083 +0200
|
2017-06-12 15:13:03 +02:00
|
|
|
@@ -550,15 +550,18 @@
|
2016-01-28 17:18:35 +01:00
|
|
|
if(${status_cond})
|
|
|
|
string(REPLACE ";" " " status_then "${status_then}")
|
|
|
|
string(REGEX REPLACE "^[ \t]+" "" status_then "${status_then}")
|
|
|
|
+ string(REGEX REPLACE "\\(ver [^\\)]+\\)" "" status_then "${status_then}")
|
|
|
|
ocv_output_status("${status_text} ${status_then}")
|
|
|
|
else()
|
|
|
|
string(REPLACE ";" " " status_else "${status_else}")
|
|
|
|
string(REGEX REPLACE "^[ \t]+" "" status_else "${status_else}")
|
|
|
|
+ string(REGEX REPLACE "\\(ver [^\\)]+\\)" "" status_else "${status_else}")
|
|
|
|
ocv_output_status("${status_text} ${status_else}")
|
|
|
|
endif()
|
|
|
|
else()
|
|
|
|
string(REPLACE ";" " " status_cond "${status_cond}")
|
|
|
|
string(REGEX REPLACE "^[ \t]+" "" status_cond "${status_cond}")
|
|
|
|
+ string(REGEX REPLACE "\\(ver [^\\)]+\\)" "" status_cond "${status_cond}")
|
|
|
|
ocv_output_status("${status_text} ${status_cond}")
|
|
|
|
endif()
|
|
|
|
else()
|