Add configuration header

cmake/scripts.cmake

@@ -254,14 +254,6 @@ function(configure_libappimage_module target)
         PRIVATE -DENABLE_BINRELOC
     )
 
-    if(LIBAPPIMAGE_DESKTOP_INTEGRATION_ENABLED)
-        target_compile_definitions (${target} PUBLIC -DLIBAPPIMAGE_DESKTOP_INTEGRATION_ENABLED)
-    endif()
-
-    if(LIBAPPIMAGE_THUMBNAILER_ENABLED)
-        target_compile_definitions (${target} PUBLIC -DLIBAPPIMAGE_THUMBNAILER_ENABLED)
-    endif()
-
     target_include_directories(${target}
         PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/>
         PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/libappimage>

include/appimage/appimage++.h

@@ -4,6 +4,7 @@
  * C++ headers aggregation to differentiate from the C only interface.
  */
 
+#include <appimage/config.h>
 #include <appimage/core/AppImage.h>
 
 #ifdef LIBAPPIMAGE_DESKTOP_INTEGRATION_ENABLED

include/appimage/appimage.h

@@ -7,6 +7,9 @@ extern "C" {
 #include <unistd.h>
 #include <stdbool.h>
 
+// Configuration header
+#include <appimage/config.h>
+
 // include header of shared library, which contains more appimage_ functions
 #include <appimage/appimage_shared.h>
 

include/appimage/appimage_legacy.h

@@ -3,6 +3,9 @@
 // system
 #include <stdio.h>
 
+// local
+#include <appimage/config.h>
+
 /**
  * All of the functions in this header are deprecated and must not be used in newly written code
  */

include/appimage/desktop_integration/IntegrationManager.h

@@ -8,6 +8,7 @@
 // local
 #include <appimage/desktop_integration/exceptions.h>
 #include <appimage/core/AppImage.h>
+#include <appimage/config.h>
 
 namespace appimage {
     namespace desktop_integration {

src/libappimage/CMakeLists.txt

@@ -18,6 +18,8 @@ endif()
 add_library(libappimage_static STATIC ${libappimage_sources})
 add_library(libappimage SHARED ${libappimage_sources} libappimage_legacy.cpp)
 
+configure_file(config.h.in ${PROJECT_BINARY_DIR}/generated-headers/appimage/config.h)
+
 foreach(target libappimage libappimage_static)
     configure_libappimage_module(${target})
     target_link_libraries(
@@ -45,7 +47,11 @@ foreach(target libappimage libappimage_static)
         target_link_libraries(${target} PRIVATE -static-libgcc -static-libstdc++)
     endif()
 
-    target_include_directories(${target} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+    target_include_directories(
+        ${target}
+        PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+        PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/generated-headers>
+    )
 
     set_property(TARGET libappimage PROPERTY PUBLIC_HEADER ${libappimage_public_header})
 
@@ -70,6 +76,12 @@ install(
     COMPONENT libappimage-dev
 )
 
+install(
+    DIRECTORY ${PROJECT_BINARY_DIR}/generated-headers/appimage/
+    DESTINATION include/appimage
+    COMPONENT libappimage-dev
+)
+
 # Add all targets to the build-tree export set
 export(
     TARGETS libappimage libappimage_shared libappimage_hashlib

src/libappimage/config.h.in

@@ -0,0 +1,15 @@
+#pragma once
+
+// LibAppImage Version
+
+#define LIBAPPIMAGE_VERSION_MAJOR @V_MAJOR@
+#define LIBAPPIMAGE_VERSION_MINOR @V_MINOR@
+#define LIBAPPIMAGE_VERSION_PATCH @V_PATCH@
+#define LIBAPPIMAGE_VERSION_SUFFIX @V_SUFFIX@
+
+#define LIBAPPIMAGE_VERSION "@libappimage_VERSION@"
+
+// Features
+
+#cmakedefine LIBAPPIMAGE_DESKTOP_INTEGRATION_ENABLED
+#cmakedefine LIBAPPIMAGE_THUMBNAILER_ENABLED

src/libappimage/desktop_integration/CMakeLists.txt

@@ -25,6 +25,7 @@ target_include_directories(
     PRIVATE $<TARGET_PROPERTY:XdgUtils::DesktopEntry,INTERFACE_INCLUDE_DIRECTORIES>
     PRIVATE $<TARGET_PROPERTY:XdgUtils::BaseDir,INTERFACE_INCLUDE_DIRECTORIES>
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+    PRIVATE $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/generated-headers>
 )
 
 configure_libappimage_module(appimage_desktop_integration)

src/libappimage/libappimage.cpp

@@ -16,13 +16,13 @@
 #include <XdgUtils/DesktopEntry/DesktopEntry.h>
 #include <appimage/utils/ResourcesExtractor.h>
 #include <appimage/core/AppImage.h>
+#include <appimage/config.h>
 #include "utils/Logger.h"
 #include "utils/hashlib.h"
 #include "utils/UrlEncoder.h"
 #include "utils/path_utils.h"
 
 #ifdef LIBAPPIMAGE_DESKTOP_INTEGRATION_ENABLED
-
 #include <appimage/desktop_integration/IntegrationManager.h>
 #include <appimage/appimage.h>
 #endif

tests/libappimage/desktop_integration/CMakeLists.txt

@@ -22,6 +22,7 @@ target_include_directories(
     PRIVATE "${PROJECT_SOURCE_DIR}/include"
     PRIVATE "${PROJECT_SOURCE_DIR}/src/libappimage"
     PRIVATE "${PROJECT_SOURCE_DIR}/src/libappimage/desktop_integration"
+    PRIVATE "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/generated-headers>"
 )
 
 target_link_libraries(

tests/libappimage/legacy/CMakeLists.txt

@@ -3,9 +3,6 @@ target_sources(fixtures INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/fixtures.h)
 set_property(TARGET fixtures PROPERTY INTERFACE_LINK_LIBRARIES xdg-basedir gtest)
 
 add_executable(test_libappimage test_libappimage.cpp)
-if(LIBAPPIMAGE_THUMBNAILER_ENABLED)
-    target_compile_definitions(test_libappimage PRIVATE -DLIBAPPIMAGE_THUMBNAILER_ENABLED)
-endif()
 target_link_libraries(test_libappimage fixtures libappimage libsquashfuse libglib libgobject gtest gtest_main)
 add_test(test_libappimage test_libappimage)