--- cmake/modules/FindXine.cmake.org 2012-01-27 21:45:34.061738811 +0100 +++ cmake/modules/FindXine.cmake 2012-01-28 11:29:32.593086443 +0100 @@ -14,16 +14,6 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# Support XINE_MIN_VERSION for compatibility: -IF(NOT Xine_FIND_VERSION) - SET(Xine_FIND_VERSION "${XINE_MIN_VERSION}") -ENDIF(NOT Xine_FIND_VERSION) - -# the minimum version of xine we require -IF(NOT Xine_FIND_VERSION) - SET(Xine_FIND_VERSION "1.1.0") -ENDIF(NOT Xine_FIND_VERSION) - FIND_PACKAGE(PkgConfig) PKG_CHECK_MODULES(PC_LIBXINE QUIET libxine) SET(XINE_DEFINITIONS ${PC_XINE_CFLAGS_OTHER}) @@ -40,32 +30,10 @@ ${PC_LIBXINE_LIBRARY_DIRS} ) -FIND_PROGRAM(XINECONFIG_EXECUTABLE NAMES xine-config - HINTS - ${PC_LIBXINE_PREFIX}/bin -) - -# Get the version number from xine.h and store it in the cache: -IF(XINE_INCLUDE_DIR AND NOT XINE_VERSION) - FILE(READ ${XINE_INCLUDE_DIR}/xine.h XINE_VERSION_CONTENT) - STRING(REGEX MATCH "#define *XINE_MAJOR_VERSION *([0-9]+)" _dummy "${XINE_VERSION_CONTENT}") - SET(XINE_VERSION_MAJOR "${CMAKE_MATCH_1}") - - STRING(REGEX MATCH "#define *XINE_MINOR_VERSION *([0-9]+)" _dummy "${XINE_VERSION_CONTENT}") - SET(XINE_VERSION_MINOR "${CMAKE_MATCH_1}") - - STRING(REGEX MATCH "#define *XINE_SUB_VERSION *([0-9]+)" _dummy "${XINE_VERSION_CONTENT}") - SET(XINE_VERSION_PATCH "${CMAKE_MATCH_1}") - - SET(XINE_VERSION "${XINE_VERSION_MAJOR}.${XINE_VERSION_MINOR}.${XINE_VERSION_PATCH}" CACHE STRING "Version number of Xine" FORCE) - - IF("${XINE_VERSION}" VERSION_GREATER "${Xine_FIND_VERSION}") - STRING(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION}) - ENDIF("${XINE_VERSION}" VERSION_GREATER "${Xine_FIND_VERSION}") -ENDIF(XINE_INCLUDE_DIR AND NOT XINE_VERSION) +SET(XINE_VERSION ${PC_LIBXINE_VERSION}) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xine REQUIRED_VARS XINE_INCLUDE_DIR XINE_LIBRARY XINECONFIG_EXECUTABLE +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xine REQUIRED_VARS XINE_INCLUDE_DIR XINE_LIBRARY VERSION_VAR XINE_VERSION) -MARK_AS_ADVANCED(XINE_INCLUDE_DIR XINE_LIBRARY XINECONFIG_EXECUTABLE) +MARK_AS_ADVANCED(XINE_INCLUDE_DIR XINE_LIBRARY)