39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
From 967fc70300d5c2ae34d39b61757b717f6fca8805 Mon Sep 17 00:00:00 2001
|
|
From: Rex Dieter <rdieter@math.unl.edu>
|
|
Date: Sat, 7 Nov 2015 06:54:26 -0600
|
|
Subject: [PATCH 2/5] FindTaglib.cmake: fix version detection for 1.10
|
|
|
|
---
|
|
cmake/modules/FindTaglib.cmake | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
|
|
index 5bbb8ee..4319d6b 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 _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
|
|
|
|
- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
|
|
+ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_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_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
|
|
|
|
exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
|
|
|
|
@@ -43,7 +43,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
|
|
message(STATUS "Found taglib: ${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_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
|
|
mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
|
|
|
|
else(TAGLIBCONFIG_EXECUTABLE)
|
|
--
|
|
1.9.3
|
|
|