From bcc60797c677887d811a0e0e13a61c47a858dfc6 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Thu, 10 May 2018 17:08:55 +0200
Subject: [PATCH] Fix taglib in makefile

---
 3rdparty/taglib/CMakeLists.txt | 18 +++++++++---------
 CMakeLists.txt                 |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/3rdparty/taglib/CMakeLists.txt b/3rdparty/taglib/CMakeLists.txt
index ab03ab84f..a9d733e49 100644
--- a/3rdparty/taglib/CMakeLists.txt
+++ b/3rdparty/taglib/CMakeLists.txt
@@ -368,15 +368,15 @@ set_target_properties(tag PROPERTIES
   LINK_INTERFACE_LIBRARIES ""
   #PUBLIC_HEADER "${tag_HDRS}"
 )
-if(BUILD_FRAMEWORK)
-  unset(INSTALL_NAME_DIR)
-  set_target_properties(tag PROPERTIES 
-      FRAMEWORK TRUE
-      MACOSX_RPATH 1
-      VERSION "A"
-      SOVERSION "A"
-      )
-endif()
+#if(BUILD_FRAMEWORK)
+#  unset(INSTALL_NAME_DIR)
+#  set_target_properties(tag PROPERTIES 
+#      FRAMEWORK TRUE
+#      MACOSX_RPATH 1
+#      VERSION "A"
+#      SOVERSION "A"
+#      )
+#endif()
 
 #install(TARGETS tag
 #  FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1405be5c..f49280251 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,7 +123,7 @@ if (TAGLIB_VERSION VERSION_GREATER 1.11.1 OR WIN32)
 else()
   option(USE_SYSTEM_TAGLIB "Use system taglib" OFF)
 endif()
-if (USE_SYSTEM_TAGLIB)
+if (TAGLIB_FOUND AND USE_SYSTEM_TAGLIB)
   message(STATUS "Using system taglib library")
   set(CMAKE_REQUIRED_INCLUDES "${TAGLIB_INCLUDE_DIRS}")
   set(CMAKE_REQUIRED_LIBRARIES "${TAGLIB_LIBRARIES}")