Git commit 52b299af96b5c668daccff89f0fdaf553c7595cc by Johannes Obermayr. Committed on 11/01/2016 at 23:58. Pushed by jobermayr into branch 'kf5'. FindTaglib.cmake: s/STRLESS/VERSION_LESS/ to detect v1.10. M +4 -4 cmake/modules/FindTaglib.cmake http://commits.kde.org/k3b/52b299af96b5c668daccff89f0fdaf553c7595cc diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake index 5bbb8ee..079fb58 100644 --- a/cmake/modules/FindTaglib.cmake +++ b/cmake/modules/FindTaglib.cmake @@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE) = exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _ret= urn_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) = - if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") + if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") 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}") + else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") = exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _ret= urn_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) = @@ -40,10 +40,10 @@ if(TAGLIBCONFIG_EXECUTABLE) = if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) set(TAGLIB_FOUND TRUE) - message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") + message(STATUS "Found taglib: version: ${TAGLIB_VERSION}, libs: ${TAGLIB_= LIBRARIES}") endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") - endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") = + endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") = mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) = else(TAGLIBCONFIG_EXECUTABLE)