Skip to content

Commit

Permalink
fix cmake for taglib 1.10
Browse files Browse the repository at this point in the history
We have to use VERSION_LESS, rather than STRLESS.
Otherwise we get this error message:
- TagLib version too old: version searched :1.6, found 1.10
  • Loading branch information
JonnyJD committed Dec 8, 2015
1 parent fb80fb8 commit 681ef05
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cmake/modules/FindTaglib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE)

exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)

if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
message(STATUS "TagLib version too old: 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 _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)

Expand All @@ -42,7 +42,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
set(TAGLIB_FOUND TRUE)
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)
Expand Down

0 comments on commit 681ef05

Please sign in to comment.