Improve CMake files (#460)

ext/libstrawberry-common/CMakeLists.txt

@@ -1,20 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src)
-include_directories(${CMAKE_BINARY_DIR}/src)
-
-if (Backtrace_FOUND)
-  include_directories(${Backtrace_INCLUDE_DIRS})
-endif(Backtrace_FOUND)
-
-include_directories(${GLIB_INCLUDE_DIRS})
-include_directories(${GLIBCONFIG_INCLUDE_DIRS})
-include_directories(${PROTOBUF_INCLUDE_DIRS})
-
 set(SOURCES
   core/closure.cpp
   core/logging.cpp
@@ -37,11 +22,32 @@ endif(APPLE)
 
 qt5_wrap_cpp(MOC ${HEADERS})
 
+link_directories(
+  ${GLIB_LIBRARY_DIRS}
+  ${Qt5Core_LIBRARY_DIRS}
+  ${Qt5Network_LIBRARY_DIRS}
+)
+
 add_library(libstrawberry-common STATIC ${SOURCES} ${MOC})
 
-if(Backtrace_FOUND)
-  target_link_libraries(libstrawberry-common ${Backtrace_LIBRARIES})
-endif(Backtrace_FOUND)
+target_include_directories(libstrawberry-common PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+  ${GLIB_INCLUDE_DIRS}
+  ${Qt5Core_INCLUDE_DIRS}
+  ${Qt5Network_INCLUDE_DIRS}
+)
 
-target_link_libraries(libstrawberry-common ${TAGLIB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-target_link_libraries(libstrawberry-common Qt5::Core Qt5::Network)
+target_link_libraries(libstrawberry-common PRIVATE
+  ${CMAKE_THREAD_LIBS_INIT}
+  ${GLIB_LIBRARIES}
+  ${Qt5Core_LIBRARIES}
+  ${Qt5Network_LIBRARIES}
+)
+
+if(Backtrace_FOUND)
+  target_include_directories(libstrawberry-common PRIVATE ${Backtrace_INCLUDE_DIRS})
+  target_link_libraries(libstrawberry-common PRIVATE ${Backtrace_LIBRARIES})
+endif(Backtrace_FOUND)