Correctly include and link to libraries

All libraries used within the project (even the imported ones) correctly define include directories etc. in their interfaces, so manually including directories and declaring dependencies is completely unnecessary and clearly makes the code less easy to read and understand. It's completely sufficient to use target_link_libraries(...) as long as PRIVATE and PUBLIC linking are done correctly.

Author: TheAssassin

src/libappimage/core/CMakeLists.txt

@@ -10,14 +10,16 @@ add_library(
     impl/StreambufType2.cpp
 )
 
-target_include_directories(
-    core
-    PRIVATE $<TARGET_PROPERTY:libappimage_hashlib,INTERFACE_INCLUDE_DIRECTORIES>
-    PRIVATE $<TARGET_PROPERTY:XdgUtils::DesktopEntry,INTERFACE_INCLUDE_DIRECTORIES>
-    PRIVATE $<TARGET_PROPERTY:libarchive,INTERFACE_INCLUDE_DIRECTORIES>
-    PRIVATE $<TARGET_PROPERTY:libsquashfuse,INTERFACE_INCLUDE_DIRECTORIES>
+target_include_directories(core
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..
 )
 
+target_link_libraries(core
+    PRIVATE Boost::boost
+    PRIVATE libappimage_hashlib
+    PRIVATE XdgUtils::DesktopEntry
+    PRIVATE libarchive
+    PRIVATE libsquashfuse
+)
+
 configure_libappimage_module(core)
-add_dependencies(core Boost::boost libappimage_hashlib XdgUtils::DesktopEntry libarchive libsquashfuse)

src/libappimage/desktop_integration/CMakeLists.txt

@@ -15,27 +15,18 @@ add_library(appimage_desktop_integration OBJECT ${appimage_desktop_integration_s
 # Include interface directories from the libs used. Ideally we will use target_link_libraries
 # but it's not supported in cmake 3.8.
 # https://cmake.org/cmake/help/latest/command/target_link_libraries.html#linking-object-libraries
-target_include_directories(
-    appimage_desktop_integration
-    PUBLIC $<TARGET_PROPERTY:libappimage_hashlib,INTERFACE_INCLUDE_DIRECTORIES>
-    PRIVATE $<TARGET_PROPERTY:libarchive,INTERFACE_INCLUDE_DIRECTORIES>
-    PRIVATE $<TARGET_PROPERTY:libsquashfuse,INTERFACE_INCLUDE_DIRECTORIES>
-    PRIVATE $<TARGET_PROPERTY:libglib,INTERFACE_INCLUDE_DIRECTORIES>
-    PRIVATE $<TARGET_PROPERTY:XdgUtils::DesktopEntry,INTERFACE_INCLUDE_DIRECTORIES>
-    PRIVATE $<TARGET_PROPERTY:XdgUtils::BaseDir,INTERFACE_INCLUDE_DIRECTORIES>
+target_include_directories(appimage_desktop_integration
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
     PRIVATE $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/generated-headers>
 )
 target_link_libraries(appimage_desktop_integration
+    PRIVATE libappimage_hashlib
     PRIVATE Boost::boost
+    PRIVATE libarchive
+    PRIVATE libsquashfuse
+    PRIVATE libglib
+    PRIVATE XdgUtils::DesktopEntry
+    PRIVATE XdgUtils::BaseDir
 )
 
 configure_libappimage_module(appimage_desktop_integration)
-add_dependencies(appimage_desktop_integration
-    libappimage_hashlib
-    libarchive
-    libsquashfuse
-    Boost::boost
-    XdgUtils::DesktopEntry
-    XdgUtils::BaseDir
-)

src/libappimage/utils/CMakeLists.txt

@@ -18,17 +18,13 @@ add_library(appimage_utils OBJECT ${APPIMAGE_UTILS_SRCS})
 
 # Generic module configuration
 configure_libappimage_module(appimage_utils)
-target_include_directories(
-    appimage_utils
-    PRIVATE $<TARGET_PROPERTY:XdgUtils::DesktopEntry,INTERFACE_INCLUDE_DIRECTORIES>
-    PRIVATE $<TARGET_PROPERTY:XdgUtils::BaseDir,INTERFACE_INCLUDE_DIRECTORIES>
-    PUBLIC $<TARGET_PROPERTY:libappimage_hashlib,INTERFACE_INCLUDE_DIRECTORIES>
-    PUBLIC $<TARGET_PROPERTY:libcairo,INTERFACE_INCLUDE_DIRECTORIES>
-    PUBLIC $<TARGET_PROPERTY:librsvg,INTERFACE_INCLUDE_DIRECTORIES>
-)
 target_include_directories(appimage_utils PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(appimage_utils
     PRIVATE Boost::boost
+    PRIVATE libappimage_hashlib
+    PRIVATE XdgUtils::DesktopEntry
+    PRIVATE XdgUtils::BaseDir
+    PUBLIC libcairo
+    PUBLIC librsvg
 )
-add_dependencies(appimage_utils libappimage_hashlib XdgUtils::DesktopEntry XdgUtils::BaseDir)
 target_compile_definitions(appimage_utils PUBLIC ${IMAGE_MANIPULATION_BACKEND_COMPILE_DEFINITIONS})