1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00

Added more version information to cmake status (Qt, CUDA, OpenEXR, gcc)

This commit is contained in:
Andrey Kamaev
2012-04-09 13:22:52 +00:00
parent 8521f8a5ec
commit aa4a45ff3b
3 changed files with 41 additions and 14 deletions
+22 -7
View File
@@ -74,13 +74,28 @@ IF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AN
ENDIF ()
IF(OPENEXR_FOUND)
IF(NOT OPENEXR_FIND_QUIETLY)
MESSAGE(STATUS "Found OpenEXR: ${OPENEXR_ILMIMF_LIBRARY}")
ENDIF()
IF(NOT OPENEXR_FIND_QUIETLY)
MESSAGE(STATUS "Found OpenEXR: ${OPENEXR_ILMIMF_LIBRARY}")
ENDIF()
if(PKG_CONFIG_FOUND AND NOT OPENEXR_VERSION)
get_filename_component(OPENEXR_LIB_PATH "${OPENEXR_ILMIMF_LIBRARY}" PATH)
if(EXISTS "${OPENEXR_LIB_PATH}/pkgconfig/OpenEXR.pc")
execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --modversion "${OPENEXR_LIB_PATH}/pkgconfig/OpenEXR.pc"
RESULT_VARIABLE PKG_CONFIG_PROCESS
OUTPUT_VARIABLE OPENEXR_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
if(NOT PKG_CONFIG_PROCESS EQUAL 0)
SET(OPENEXR_VERSION "Unknown")
endif()
endif()
endif()
if(NOT OPENEXR_VERSION)
SET(OPENEXR_VERSION "Unknown")
endif()
ELSE()
IF(OPENEXR_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find OpenEXR library")
ENDIF()
IF(OPENEXR_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find OpenEXR library")
ENDIF()
ENDIF()
MARK_AS_ADVANCED(
@@ -90,4 +105,4 @@ MARK_AS_ADVANCED(
OPENEXR_IMATH_LIBRARY
OPENEXR_IEX_LIBRARY
OPENEXR_HALF_LIBRARY
OPENEXR_ILMTHREAD_LIBRARY)
OPENEXR_ILMTHREAD_LIBRARY)
+2 -1
View File
@@ -277,7 +277,7 @@ macro(ocv_to_full_paths VAR)
endmacro()
# read set of defines from the header file
# read set of version defines from the header file
macro(ocv_parse_header FILENAME FILE_VAR)
set(vars_regex "")
set(__parnet_scope OFF)
@@ -318,6 +318,7 @@ macro(ocv_parse_header FILENAME FILE_VAR)
endforeach()
endmacro()
# read single version define from the header file
macro(ocv_parse_header2 LIBNAME HDR_PATH VARNAME SCOPE)
set(${LIBNAME}_H "")
if(EXISTS "${HDR_PATH}")