d986758c9b
1 OBS-URL: https://build.opensuse.org/request/show/355402 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=60
47 lines
2.1 KiB
Diff
47 lines
2.1 KiB
Diff
---
|
|
CMakeLists.txt | 4 ++--
|
|
cmake/OpenCVUtils.cmake | 3 +++
|
|
2 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
Index: opencv-2.4.11/CMakeLists.txt
|
|
===================================================================
|
|
--- opencv-2.4.11.orig/CMakeLists.txt
|
|
+++ opencv-2.4.11/CMakeLists.txt
|
|
@@ -675,11 +675,11 @@ endif()
|
|
# ========================== 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)
|
|
Index: opencv-2.4.11/cmake/OpenCVUtils.cmake
|
|
===================================================================
|
|
--- opencv-2.4.11.orig/cmake/OpenCVUtils.cmake
|
|
+++ opencv-2.4.11/cmake/OpenCVUtils.cmake
|
|
@@ -319,15 +319,18 @@ function(status text)
|
|
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()
|