Skip to content

FindCImg.cmake: Also declare CImgStatic target #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
arrowd wants to merge 1 commit into from
Closed

FindCImg.cmake: Also declare CImgStatic target #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions cmake/Modules/FindCImg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,14 @@ else()
set(PNG_INCLUDE_DIR ${libpng_INCLUDE_DIRS})
set(JPEG_INCLUDE_DIR ${libjpeg_INCLUDE_DIRS})

if(STATIC_BUILD)
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})
endif()
set(PNG_STATIC_LIBRARY ${libpng_STATIC_LIBRARIES})
set(JPEG_STATIC_LIBRARIES ${libjpeg_STATIC_LIBRARIES})
set(PNG_LIBRARY ${libpng_LINK_LIBRARIES})
set(JPEG_LIBRARIES ${libjpeg_LINK_LIBRARIES})

set(CImg_INCLUDE_DIR ${CIMG_H_DIR} CACHE STRING "")
set(CImg_INCLUDE_DIRS ${CImg_INCLUDE_DIR})
set(CImg_STATIC_LIBRARIES "${PNG_STATIC_LIBRARY};${JPEG_STATIC_LIBRARIES}")
set(CImg_LIBRARIES "${PNG_LIBRARY};${JPEG_LIBRARIES}")
set(CImg_DEFINITIONS "cimg_display=0;cimg_use_png=1;cimg_use_jpeg=1")

Expand All @@ -84,6 +82,12 @@ else()
set_property(TARGET CImg PROPERTY INTERFACE_LINK_LIBRARIES "${CImg_LIBRARIES}")
set_property(TARGET CImg PROPERTY INTERFACE_COMPILE_DEFINITIONS "${CImg_DEFINITIONS}")
endif()
if(NOT TARGET CImgStatic)
add_library(CImgStatic INTERFACE)
set_property(TARGET CImgStatic PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CIMG_H_DIR};${PNG_INCLUDE_DIR};${JPEG_INCLUDE_DIR}")
set_property(TARGET CImgStatic PROPERTY INTERFACE_LINK_LIBRARIES "${CImg_STATIC_LIBRARIES}")
set_property(TARGET CImgStatic PROPERTY INTERFACE_COMPILE_DEFINITIONS "${CImg_DEFINITIONS}")
endif()
endif()

include(FindPackageHandleStandardArgs)
Expand Down
2 changes: 1 addition & 1 deletion tests/simple_library/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ add_custom_target(simple_library_stripped ALL DEPENDS libsimple_library.so.strip

# add a static version, too
add_library(simple_library_static STATIC simple_library.cpp simple_library.h)
target_link_libraries(simple_library_static PUBLIC CImg)
target_link_libraries(simple_library_static PUBLIC CImgStatic)
target_include_directories(simple_library_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
Loading