Improve CMake files (#460)

2020-06-17 22:56:20 +02:00
parent 64f0313d3c
commit 3b58c02db0
16 changed files with 419 additions and 301 deletions
--- a/ext/gstmoodbar/CMakeLists.txt
+++ b/ext/gstmoodbar/CMakeLists.txt
@@ -1,23 +1,36 @@
 cmake_minimum_required(VERSION 3.0)

-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${GLIB_INCLUDE_DIRS})
-include_directories(${GOBJECT_INCLUDE_DIRS})
-include_directories(${GSTREAMER_INCLUDE_DIRS})
-include_directories(${GSTREAMER_AUDIO_INCLUDE_DIRS})
-include_directories(${FFTW3_INCLUDE_DIR})
-
 set(SOURCES gstfastspectrum.cpp gstmoodbarplugin.cpp)

-add_library(gstmoodbar STATIC ${SOURCES})
-
-target_link_libraries(gstmoodbar
-  ${GOBJECT_LIBRARIES}
-  ${GLIB_LIBRARIES}
-  ${GSTREAMER_LIBRARIES}
-  ${GSTREAMER_AUDIO_LIBRARIES}
-  ${GSTREAMER_BASE_LIBRARIES}
-  ${FFTW3_FFTW_LIBRARY}
+link_directories(
+  ${GLIB_LIBRARY_DIRS}
+  ${GOBJECT_LIBRARY_DIRS}
+  ${GSTREAMER_LIBRARY_DIRS}
+  ${GSTREAMER_BASE_LIBRARY_DIRS}
+  ${GSTREAMER_AUDIO_LIBRARY_DIRS}
+  ${FFTW3_LIBRARY_DIRS}
+  ${Qt5Core_LIBRARY_DIRS}
 )

-target_link_libraries(gstmoodbar Qt5::Core)
+add_library(gstmoodbar STATIC ${SOURCES})
+
+target_include_directories(gstmoodbar PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${GLIB_INCLUDE_DIRS}
+  ${GOBJECT_INCLUDE_DIRS}
+  ${GSTREAMER_INCLUDE_DIRS}
+  ${GSTREAMER_BASE_INCLUDE_DIRS}
+  ${GSTREAMER_AUDIO_INCLUDE_DIRS}
+  ${FFTW3_INCLUDE_DIR}
+  ${Qt5Core_INCLUDE_DIRS}
+)
+
+target_link_libraries(gstmoodbar PRIVATE
+  ${GLIB_LIBRARIES}
+  ${GOBJECT_LIBRARIES}
+  ${GSTREAMER_LIBRARIES}
+  ${GSTREAMER_BASE_LIBRARIES}
+  ${GSTREAMER_AUDIO_LIBRARIES}
+  ${FFTW3_FFTW_LIBRARY}
+  ${Qt5Core_LIBRARIES}
+)
--- a/ext/libstrawberry-common/CMakeLists.txt
+++ b/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)
--- a/ext/libstrawberry-tagreader/CMakeLists.txt
+++ b/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
+)
--- a/ext/libstrawberry-tagreader/tagreader.cpp
+++ b/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>
--- a/ext/strawberry-tagreader/CMakeLists.txt
+++ b/ext/strawberry-tagreader/CMakeLists.txt
@@ -1,19 +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}/ext/libstrawberry-common)
-include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader)
-include_directories(${CMAKE_BINARY_DIR}/ext/libstrawberry-tagreader)
-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(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})

 set(SOURCES main.cpp tagreaderworker.cpp)
@@ -21,22 +7,42 @@ set(SOURCES main.cpp tagreaderworker.cpp)
 qt5_wrap_cpp(MOC ${HEADERS})
 qt5_add_resources(QRC data/data.qrc)

+link_directories(
+  ${GLIB_LIBRARY_DIRS}
+  ${TAGLIB_LIBRARY_DIRS}
+  ${Qt5Core_LIBRARY_DIRS}
+  ${Qt5Network_LIBRARY_DIRS}
+)
+
 add_executable(strawberry-tagreader ${SOURCES} ${MOC} ${QRC})

-target_link_libraries(strawberry-tagreader
+target_include_directories(strawberry-tagreader PRIVATE
+  ${GLIB_INCLUDE_DIRS}
+  ${PROTOBUF_INCLUDE_DIRS}
+  ${TAGLIB_INCLUDE_DIRS}
+  ${Qt5Core_INCLUDE_DIRS}
+  ${Qt5Network_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common
+  ${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader
+  ${CMAKE_BINARY_DIR}/ext/libstrawberry-tagreader
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry-tagreader PRIVATE
+  ${GLIB_LIBRARIES}
  ${TAGLIB_LIBRARIES}
-  ${QT_QTCORE_LIBRARY}
-  ${QT_QTNETWORK_LIBRARY}
+  ${Qt5Core_LIBRARIES}
+  ${Qt5Network_LIBRARIES}
  libstrawberry-common
  libstrawberry-tagreader
 )

 if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-  target_link_libraries(strawberry-tagreader execinfo)
+  target_link_libraries(strawberry-tagreader PRIVATE execinfo)
 endif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")

 if(APPLE)
-  target_link_libraries(strawberry-tagreader /System/Library/Frameworks/Foundation.framework)
+  target_link_libraries(strawberry-tagreader PRIVATE /System/Library/Frameworks/Foundation.framework)
 endif(APPLE)

 install(TARGETS strawberry-tagreader RUNTIME DESTINATION bin)