From aa871ca506b8a75a057db5223a5ff0a39a90e0a2 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 10 Jul 2015 19:18:07 +0300 Subject: [PATCH] fix wrong usage of status(), remove useless message in videoio --- cmake/OpenCVModule.cmake | 6 +++--- modules/highgui/CMakeLists.txt | 12 ++++++------ modules/videoio/CMakeLists.txt | 3 +-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake index c37531a91..57305054d 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake @@ -720,15 +720,15 @@ macro(_ocv_create_module) set(sub_links "") set(cuda_objs "") if (OPENCV_MODULE_${the_module}_CHILDREN) - status("Complex module ${the_module}") + message(STATUS "Complex module ${the_module}") foreach (m ${OPENCV_MODULE_${the_module}_CHILDREN}) if (BUILD_${m} AND TARGET ${m}_object) get_target_property(_sub_links ${m} LINK_LIBRARIES) list(APPEND sub_objs $) list(APPEND sub_links ${_sub_links}) - status(" + ${m}") + message(STATUS " + ${m}") else() - status(" - ${m}") + message(STATUS " - ${m}") endif() list(APPEND cuda_objs ${OPENCV_MODULE_${m}_CUDA_OBJECTS}) endforeach() diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt index 03be473ae..9d1745e7b 100644 --- a/modules/highgui/CMakeLists.txt +++ b/modules/highgui/CMakeLists.txt @@ -76,7 +76,7 @@ elseif(WINRT) # Enabling it for WiRT 8.1+ only. # WinRT 8.1+ detected. Adding WinRT API header. - status(" ${name}: WinRT detected. Adding WinRT API header") + message(STATUS " ${name}: WinRT detected. Adding WinRT API header") list(APPEND highgui_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/highgui_winrt.hpp") @@ -92,16 +92,16 @@ elseif(WINRT) if(WINRT_PHONE OR (OpenCV_ARCH STREQUAL "ARM")) list(REMOVE_ITEM HIGHGUI_LIBRARIES "comctl32" "gdi32" "ole32" "setupapi") if(WINRT_PHONE) - status(" ${name}: Windows Phone detected") + message(STATUS " ${name}: Windows Phone detected") elseif(OpenCV_ARCH STREQUAL "ARM") - status(" ${name}: ARM detected") + message(STATUS " ${name}: ARM detected") if(WINRT_STORE) list(REMOVE_ITEM HIGHGUI_LIBRARIES "ws2_32") - status(" ${name}: Removing 'ws2_32.lib'") + message(STATUS " ${name}: Removing 'ws2_32.lib'") endif() endif() - status(" ${name}: Removing 'comctl32.lib, gdi32.lib, ole32.lib, setupapi.lib'") - status(" ${name}: Leaving '${HIGHGUI_LIBRARIES}'") + message(STATUS " ${name}: Removing 'comctl32.lib, gdi32.lib, ole32.lib, setupapi.lib'") + message(STATUS " ${name}: Leaving '${HIGHGUI_LIBRARIES}'") endif() elseif(HAVE_WIN32UI) list(APPEND highgui_srcs ${CMAKE_CURRENT_LIST_DIR}/src/window_w32.cpp) diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt index 594263388..2f5bed972 100644 --- a/modules/videoio/CMakeLists.txt +++ b/modules/videoio/CMakeLists.txt @@ -33,7 +33,6 @@ file(GLOB videoio_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.h") # Removing WinRT API headers by default -status(" ${name}: Removing WinRT API headers by default") list(REMOVE_ITEM videoio_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/cap_winrt.hpp") # Dependencies used by the implementation referenced @@ -42,7 +41,7 @@ list(REMOVE_ITEM videoio_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${n if(DEFINED WINRT AND NOT DEFINED WINRT_8_0) # WinRT detected. Adding WinRT API header - status(" ${name}: WinRT detected. Adding WinRT API header") + message(STATUS " ${name}: WinRT detected. Adding WinRT API header") list(APPEND videoio_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/cap_winrt.hpp") # Adding WinRT internal sources and headers