Improve CMake files (#460)

ext/libstrawberry-tagreader/CMakeLists.txt

@@ -1,21 +1,36 @@
 cmake_minimum_required(VERSION 3.0)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-common)
-include_directories(${CMAKE_SOURCE_DIR}/src)
-include_directories(${CMAKE_BINARY_DIR}/src)
-
-link_directories(${PROTOBUF_LIBRARY_DIRS})
-include_directories(${PROTOBUF_INCLUDE_DIRS})
-
-link_directories(${TAGLIB_LIBRARY_DIRS})
-include_directories(${TAGLIB_INCLUDE_DIRS})
-
 set(MESSAGES tagreadermessages.proto)
 set(SOURCES fmpsparser.cpp tagreader.cpp)
 
 protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES})
 
+link_directories(
+  ${GLIB_LIBRARY_DIRS}
+  ${PROTOBUF_LIBRARY_DIRS}
+  ${TAGLIB_LIBRARY_DIRS}
+  ${Qt5Core_LIBRARY_DIRS}
+)
+
 add_library(libstrawberry-tagreader STATIC ${PROTO_SOURCES} ${SOURCES})
-target_link_libraries(libstrawberry-tagreader ${PROTOBUF_LIBRARY} libstrawberry-common)
+
+target_include_directories(libstrawberry-tagreader PRIVATE
+  ${GLIB_INCLUDE_DIRS}
+  ${PROTOBUF_INCLUDE_DIRS}
+  ${TAGLIB_INCLUDE_DIRS}
+  ${Qt5Core_INCLUDE_DIRS}
+  ${Qt5Network_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(libstrawberry-tagreader PRIVATE
+  ${GLIB_LIBRARIES}
+  ${PROTOBUF_LIBRARY}
+  ${TAGLIB_LIBRARIES}
+  ${Qt5Core_LIBRARIES}
+  libstrawberry-common
+)

ext/libstrawberry-tagreader/tagreader.cpp

@@ -26,7 +26,6 @@
 #include <sys/stat.h>
 
 #include <taglib/taglib.h>
-#include <taglib/taglib_config.h>
 #include <taglib/fileref.h>
 #include <taglib/tbytevector.h>
 #include <taglib/tfile.h>