93271feb41
Update to 4.1.1 OBS-URL: https://build.opensuse.org/request/show/722304 OBS-URL: https://build.opensuse.org/package/show/science/opencv?expand=0&rev=2
43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 8631bbc..60352a0 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1099,11 +1099,11 @@ endif()
|
|
if(OPENCV_TIMESTAMP)
|
|
status(" Timestamp:" ${OPENCV_TIMESTAMP})
|
|
endif()
|
|
-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)
|
|
diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
|
|
index 9cba5d9..71f764c 100644
|
|
--- a/cmake/OpenCVUtils.cmake
|
|
+++ b/cmake/OpenCVUtils.cmake
|
|
@@ -922,15 +922,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()
|
|
|