Skip to content
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

Jump to bottom

Fix examples building with pkg-config being present on llvm-mingw #754

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix examples building with pkg-config being present on llvm-mingw #754

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
52 changes: 15 additions & 37 deletions examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,15 @@ set (additional_link_directories)
set (additional_libraries)
set (additional_includes)

include (${CMAKE_ROOT}/Modules/FindJPEG.cmake)
find_package(JPEG)
find_package(PNG)

if(JPEG_FOUND)
add_definitions(-DHAVE_LIBJPEG=1)
include_directories(SYSTEM ${JPEG_INCLUDE_DIR})

include (${CMAKE_ROOT}/Modules/CheckCXXSourceCompiles.cmake)

set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARIES})

# while the docs say JPEG_INCLUDE_DIRS, my FindJPEG.cmake script returns it in JPEG_INCLUDE_DIR
set(CMAKE_REQUIRED_INCLUDES ${JPEG_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR})
include (CheckCXXSourceCompiles)

set(CMAKE_REQUIRED_LIBRARIES JPEG::JPEG)
check_cxx_source_compiles("
#include <stddef.h>
#include <stdio.h>
Expand All @@ -38,6 +34,7 @@ int main() {
return 0;
}
" HAVE_JPEG_WRITE_ICC_PROFILE)
unset(CMAKE_REQUIRED_LIBRARIES)
if(HAVE_JPEG_WRITE_ICC_PROFILE)
add_definitions(-DHAVE_JPEG_WRITE_ICC_PROFILE=1)
endif()
Expand All @@ -49,38 +46,21 @@ set (heif_convert_sources
)
set (additional_libraries
${additional_libraries}
${JPEG_LIBRARIES}
)
set (additional_includes
${additional_includes}
${JPEG_INCLUDE_DIRS}
${JPEG_INCLUDE_DIR}
JPEG::JPEG
)
endif()

if(UNIX OR MINGW)
include (${CMAKE_ROOT}/Modules/FindPkgConfig.cmake)
pkg_check_modules (LIBPNG libpng)
if(LIBPNG_FOUND)
add_definitions(-DHAVE_LIBPNG=1)
set (heif_convert_sources
if(PNG_FOUND)
add_definitions(-DHAVE_LIBPNG=1)
set (heif_convert_sources
${heif_convert_sources}
encoder_png.cc
encoder_png.h
benchmark.h benchmark.cc)
set (additional_link_directories
${additional_link_directories}
${LIBPNG_LIBRARY_DIRS}
)
set (additional_libraries
${additional_libraries}
${LIBPNG_LINK_LIBRARIES} ${LIBPNG_LIBRARIES}
)
set (additional_includes
${additional_includes}
${LIBPNG_INCLUDE_DIRS}
)
endif()
set (additional_libraries
${additional_libraries}
PNG::PNG
)
endif()

set (heif_info_sources
Expand Down Expand Up @@ -131,7 +111,7 @@ add_executable (heif-test ${heif_test_sources} ${getopt_sources})
target_link_libraries (heif-test heif)


if(LIBPNG_FOUND)
if(PNG_FOUND)
set (heif_thumbnailer_sources
encoder.cc
encoder.h
Expand All @@ -143,9 +123,7 @@ if(LIBPNG_FOUND)
)

add_executable (heif-thumbnailer ${heif_thumbnailer_sources})
target_link_directories (heif-thumbnailer PRIVATE ${LIBPNG_LIBRARY_DIRS})
target_link_libraries (heif-thumbnailer heif ${LIBPNG_LINK_LIBRARIES} ${LIBPNG_LIBRARIES})
target_include_directories(heif-thumbnailer PRIVATE ${LIBPNG_INCLUDE_DIRS})
target_link_libraries (heif-thumbnailer heif PNG::PNG)
install(TARGETS heif-thumbnailer RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES heif-thumbnailer.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
endif()