generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Slightly improved cmake status report

Browse Source
This commit is contained in:
Andrey Kamaev 2012-04-10 08:28:09 +00:00
parent 18067c8e9f
commit 12d42768f8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -822,7 +822,7 @@ if(UNIX AND NOT APPLE)
else()
set(HAVE_CAMV4L2_STR "NO")
endif()
status(" V4L/V4L2:" HAVE_LIBV4L THEN "Using libv4l (ver ${ALIASOF_libv4l1_VERSION})" ELSE "${HAVE_CAMV4L_STR}/${HAVE_CAMV4L2_STR} (ver ${ALIASOF_libv4l1_VERSION})")
status(" V4L/V4L2:" HAVE_LIBV4L THEN "Using libv4l (ver ${ALIASOF_libv4l1_VERSION})" ELSE "${HAVE_CAMV4L_STR}/${HAVE_CAMV4L2_STR}")
status(" Xine:" HAVE_XINE THEN "YES (ver ${ALIASOF_libxine_VERSION}" ELSE NO)
if(ANDROID)

3
cmake/OpenCVUtils.cmake
View File

@ -151,13 +151,16 @@ function(status text)
if(DEFINED status_then OR DEFINED status_else)
if(${status_cond})
string(REPLACE ";" " " status_then "${status_then}")
string(REGEX REPLACE "^[ \t]+" "" 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}")
ocv_output_status("${status_text} ${status_else}")
endif()
else()
string(REPLACE ";" " " status_cond "${status_cond}")
string(REGEX REPLACE "^[ \t]+" "" status_cond "${status_cond}")
ocv_output_status("${status_text} ${status_cond}")
endif()
else()