diff --git a/cmake/Modules/FindCImg.cmake b/cmake/Modules/FindCImg.cmake index 09e7fe8..0ab720a 100644 --- a/cmake/Modules/FindCImg.cmake +++ b/cmake/Modules/FindCImg.cmake @@ -63,13 +63,14 @@ 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 "") 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 f70a622..d01478e 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)