2016-03-05 11:21:23 +01:00
|
|
|
--- opencv-3.1.0.orig/CMakeLists.txt 2015-12-18 16:02:16.000000000 +0100
|
|
|
|
|
+++ opencv-3.1.0/CMakeLists.txt 2016-02-26 22:35:39.707706679 +0100
|
|
|
|
|
@@ -757,11 +757,11 @@
|
2016-01-28 17:18:35 +01:00
|
|
|
# ========================== build platform ==========================
|
|
|
|
|
status("")
|
|
|
|
|
status(" Platform:")
|
|
|
|
|
-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)
|
2016-03-05 11:21:23 +01:00
|
|
|
--- opencv-3.1.0.orig/cmake/OpenCVUtils.cmake 2015-12-18 16:02:16.000000000 +0100
|
|
|
|
|
+++ opencv-3.1.0/cmake/OpenCVUtils.cmake 2016-02-26 22:38:12.012651960 +0100
|
|
|
|
|
@@ -398,15 +398,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()
|
