From 49ee6a75fcf1f67bfb69c9b8c37f50a9924df5b0 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Wed, 22 Apr 2026 01:34:06 +0200 Subject: [PATCH 1/2] Fix dynamic linking on Linux --- cmake/Modules/FindCImg.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Modules/FindCImg.cmake b/cmake/Modules/FindCImg.cmake index 09e7fe86..343a1ae7 100644 --- a/cmake/Modules/FindCImg.cmake +++ b/cmake/Modules/FindCImg.cmake @@ -63,8 +63,8 @@ else() set(PNG_LIBRARY ${libpng_STATIC_LIBRARIES}) set(JPEG_LIBRARIES ${libjpeg_STATIC_LIBRARIES}) else() - set(PNG_LIBRARY ${libpng_LINK_LIBRARIES}) - set(JPEG_LIBRARIES ${libjpeg_LINK_LIBRARIES}) + set(PNG_LIBRARY ${libpng_LIBRARIES}) + set(JPEG_LIBRARIES ${libjpeg_LIBRARIES}) endif() set(CImg_INCLUDE_DIR ${CIMG_H_DIR} CACHE STRING "") From ec9824fdde5f3f5b6e1b6d13b7078e6682a72bd0 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Wed, 22 Apr 2026 01:34:25 +0200 Subject: [PATCH 2/2] Fix static build on FreeBSD Thanks @arrowd for assisting! --- cmake/Modules/FindCImg.cmake | 2 ++ src/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/Modules/FindCImg.cmake b/cmake/Modules/FindCImg.cmake index 343a1ae7..0ab720a0 100644 --- a/cmake/Modules/FindCImg.cmake +++ b/cmake/Modules/FindCImg.cmake @@ -70,6 +70,7 @@ else() set(CImg_INCLUDE_DIR ${CIMG_H_DIR} CACHE STRING "") set(CImg_INCLUDE_DIRS ${CImg_INCLUDE_DIR}) set(CImg_LIBRARIES "${PNG_LIBRARY};${JPEG_LIBRARIES}") + set(CImg_LIBRARY_DIRS "${libpng_LIBRARY_DIRS};${libjpeg_LIBRARY_DIRS}") set(CImg_DEFINITIONS "cimg_display=0;cimg_use_png=1;cimg_use_jpeg=1") file(READ "${CIMG_H_DIR}/CImg.h" header) @@ -82,6 +83,7 @@ else() add_library(CImg INTERFACE) set_property(TARGET CImg PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CIMG_H_DIR};${PNG_INCLUDE_DIR};${JPEG_INCLUDE_DIR}") set_property(TARGET CImg PROPERTY INTERFACE_LINK_LIBRARIES "${CImg_LIBRARIES}") + set_property(TARGET CImg PROPERTY INTERFACE_LINK_DIRECTORIES "${CImg_LIBRARY_DIRS}") set_property(TARGET CImg PROPERTY INTERFACE_COMPILE_DEFINITIONS "${CImg_DEFINITIONS}") endif() endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f70a622b..d01478ef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -53,7 +53,7 @@ endif() add_executable(plugin_test plugin_test_main.cpp) -target_link_libraries(plugin_test linuxdeploy_plugin) +target_link_libraries(plugin_test linuxdeploy_plugin CImg) set_target_properties(plugin_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") add_executable(appdir_test appdir_test_main.cpp ../include/linuxdeploy/util/assert.h)