From c701c76ec0837ce22de54eb661f451a1be0b50fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Grabowski?= Date: Mon, 15 Jul 2024 12:28:49 +0200 Subject: [PATCH 1/2] Fixing some includes --- src/core/appdir.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/core/appdir.cpp b/src/core/appdir.cpp index 4a696a5..dd3fa71 100644 --- a/src/core/appdir.cpp +++ b/src/core/appdir.cpp @@ -12,15 +12,16 @@ // local headers -#include "linuxdeploy/core/appdir.h" -#include "linuxdeploy/core/elf_file.h" -#include "linuxdeploy/log/log.h" -#include "linuxdeploy/util/util.h" -#include "linuxdeploy/subprocess/subprocess.h" -#include "copyright.h" +#include +#include +#include +#include +#include +#include + // auto-generated headers -#include "excludelist.h" +#include #include "appdir_root_setup.h" using namespace linuxdeploy::core; From 4f40625a2d5c60bf2e6369fec9bb79d1bf115f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Grabowski?= Date: Mon, 15 Jul 2024 15:09:15 +0200 Subject: [PATCH 2/2] Making linking to copyright library PUBLIC --- src/core/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index f6bc660..3d17359 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -41,6 +41,6 @@ target_link_libraries(linuxdeploy_core PUBLIC linuxdeploy_plugin linuxdeploy_log linuxdeploy_util linuxdeploy_desktopfile_static CImg ${CMAKE_THREAD_LIBS_INIT} ) -target_link_libraries(linuxdeploy_core PRIVATE linuxdeploy_core_copyright) +target_link_libraries(linuxdeploy_core PUBLIC linuxdeploy_core_copyright) target_include_directories(linuxdeploy_core PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(linuxdeploy_core PUBLIC ${PROJECT_SOURCE_DIR}/include)