diff options
| -rw-r--r-- | modules/FindQt4.cmake | 4 | ||||
| -rw-r--r-- | modules/FindTaglib.cmake | 49 |
2 files changed, 26 insertions, 27 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 797bd972..55c44dfd 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -219,7 +219,6 @@ # The qtmain library for Windows QT_QTMAIN_LIBRARY # # The QtUiTools library: QT_QTUITOOLS_LIBRARY - # # The QtAssistantClient library: QT_QTASSISTANTCLIENT_LIBRARY # @@ -230,9 +229,6 @@ # The QtXmlPatterns library: QT_QTXMLPATTERNS_LIBRARY # # The Phonon library: QT_PHONON_LIBRARY - - - # # also defined, but NOT for general use are # QT_MOC_EXECUTABLE Where to find the moc tool. diff --git a/modules/FindTaglib.cmake b/modules/FindTaglib.cmake index 35fd6b03..3edfdb4a 100644 --- a/modules/FindTaglib.cmake +++ b/modules/FindTaglib.cmake @@ -14,37 +14,40 @@ if(NOT TAGLIB_MIN_VERSION) set(TAGLIB_MIN_VERSION "1.4") endif(NOT TAGLIB_MIN_VERSION) -IF(NOT WIN32) - FIND_PROGRAM(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS +if(NOT WIN32) + find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS ${BIN_INSTALL_DIR} ) -ENDIF(NOT WIN32) +endif(NOT WIN32) + #reset vars set(TAGLIB_LIBRARIES) set(TAGLIB_CFLAGS) # if taglib-config has been found -IF(TAGLIBCONFIG_EXECUTABLE) +if(TAGLIBCONFIG_EXECUTABLE) - EXEC_PROGRAM(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") - MESSAGE(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") - SET(TAGLIB_FOUND FALSE) + message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") + set(TAGLIB_FOUND FALSE) else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") - EXEC_PROGRAM(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) - EXEC_PROGRAM(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) - IF(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) - SET(TAGLIB_FOUND TRUE) + if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + set(TAGLIB_FOUND TRUE) message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") - ENDIF(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + + endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") + mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES) + +else(TAGLIBCONFIG_EXECUTABLE) - endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") - MARK_AS_ADVANCED(TAGLIB_CFLAGS TAGLIB_LIBRARIES) -ELSE(TAGLIBCONFIG_EXECUTABLE) include(FindLibraryWithDebug) include(FindPackageHandleStandardArgs) @@ -67,16 +70,16 @@ ELSE(TAGLIBCONFIG_EXECUTABLE) find_package_handle_standard_args(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES) -ENDIF(TAGLIBCONFIG_EXECUTABLE) +endif(TAGLIBCONFIG_EXECUTABLE) if(TAGLIB_FOUND) - IF(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) - MESSAGE(STATUS "Taglib found: ${TAGLIB_LIBRARIES}") - ENDIF(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) -ELSE(TAGLIB_FOUND) - IF(Taglib_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Taglib") - ENDIF(Taglib_FIND_REQUIRED) + if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) + message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}") + endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) +else(TAGLIB_FOUND) + if(Taglib_FIND_REQUIRED) + message(FATAL_ERROR "Could not find Taglib") + endif(Taglib_FIND_REQUIRED) endif(TAGLIB_FOUND) |