diff --git a/CMakeLists.txt b/CMakeLists.txt index c7c76ec..b9257c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -960,11 +960,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 fae91c1..89bfd0d 100644 --- a/cmake/OpenCVUtils.cmake +++ b/cmake/OpenCVUtils.cmake @@ -804,15 +804,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()