From b42e93d29bb5bcc2161e5d564f6f60afcecc6bf8 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Sat, 27 Oct 2012 17:25:27 -0700 Subject: [PATCH] Make the Ubuntu and Fedora packages depend on sparsehash, and use the builtin taglib by default if the system's version is too old --- 3rdparty/taglib/CMakeLists.txt | 1 - CMakeLists.txt | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/3rdparty/taglib/CMakeLists.txt b/3rdparty/taglib/CMakeLists.txt index e736a74ca..23d8592f6 100644 --- a/3rdparty/taglib/CMakeLists.txt +++ b/3rdparty/taglib/CMakeLists.txt @@ -311,7 +311,6 @@ endif() set_target_properties(tag PROPERTIES VERSION ${TAGLIB_SOVERSION_MAJOR}.${TAGLIB_SOVERSION_MINOR}.${TAGLIB_SOVERSION_PATCH} SOVERSION ${TAGLIB_SOVERSION_MAJOR} - INSTALL_NAME_DIR ${LIB_INSTALL_DIR} DEFINE_SYMBOL MAKE_TAGLIB_LIB LINK_INTERFACE_LIBRARIES "" ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36ddf5c4c..c0b54189e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,9 @@ find_path(SPARSEHASH_INCLUDE_DIRS google/sparsetable) # installed and haven't disabled drive), and has an old taglib, compile our # internal one and use that instead. option(USE_BUILTIN_TAGLIB "If the system's version of Taglib is too old for Google Drive support, compile our builtin version instead" ON) -if (USE_BUILTIN_TAGLIB AND ENABLE_GOOGLE_DRIVE AND SPARSEHASH_INCLUDE_DIRS AND +if (USE_BUILTIN_TAGLIB AND + (NOT "${ENABLE_GOOGLE_DRIVE}" STREQUAL "OFF") AND + SPARSEHASH_INCLUDE_DIRS AND TAGLIB_VERSION VERSION_LESS 1.8) set(TAGLIB_VERSION 1.8) set(TAGLIB_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/3rdparty/taglib/headers/taglib/;${CMAKE_BINARY_DIR}/3rdparty/taglib/headers/")