CMake: bump min required, use imported targets

strukturag · Oct 9, 2023 · 7867675 · 7867675
1 parent c5c2d46
commit 7867675
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 22 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required (VERSION 3.16.3) # Oldest Ubuntu LTS (20.04 currently)
 
 project(libheif LANGUAGES C CXX VERSION 1.16.2)
 

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -46,7 +46,6 @@ add_executable(heif-enc ${getopt_sources}
  common.cc
  common.h)
 target_link_libraries(heif-enc PRIVATE heif)
-
 install(TARGETS heif-enc RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES heif-enc.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 
@@ -59,7 +58,7 @@ target_link_libraries(heif-test heif)
 
 
 find_package(JPEG)
-if (JPEG_FOUND)
+if (TARGET JPEG::JPEG)
  add_definitions(-DHAVE_LIBJPEG=1)
 
  include(CheckCXXSourceCompiles)
@@ -84,31 +83,24 @@ int main() {
  add_definitions(-DHAVE_JPEG_WRITE_ICC_PROFILE=1)
  endif ()
 
- target_link_libraries(heif-convert PRIVATE ${JPEG_LIBRARIES})
- target_link_libraries(heif-enc PRIVATE ${JPEG_LIBRARIES})
- target_include_directories(heif-convert PRIVATE ${JPEG_INCLUDE_DIRS})
- target_include_directories(heif-enc PRIVATE ${JPEG_INCLUDE_DIRS})
+ target_link_libraries(heif-convert PRIVATE JPEG::JPEG)
+ target_link_libraries(heif-enc PRIVATE JPEG::JPEG)
 
  target_sources(heif-convert PRIVATE encoder_jpeg.cc encoder_jpeg.h)
  target_sources(heif-enc PRIVATE decoder.h decoder_jpeg.cc decoder_jpeg.h)
 endif ()
 
 
 find_package(PNG)
-if (PNG_FOUND)
+if (TARGET PNG::PNG)
  add_definitions(-DHAVE_LIBPNG=1)
 
- target_link_libraries(heif-convert PRIVATE ${PNG_LIBRARIES})
- target_link_libraries(heif-enc PRIVATE ${PNG_LIBRARIES})
- target_include_directories(heif-convert PRIVATE ${PNG_INCLUDE_DIRS})
- target_include_directories(heif-enc PRIVATE ${PNG_INCLUDE_DIRS})
+ target_link_libraries(heif-convert PRIVATE PNG::PNG)
+ target_link_libraries(heif-enc PRIVATE PNG::PNG)
 
  target_sources(heif-convert PRIVATE encoder_png.cc encoder_png.h)
  target_sources(heif-enc PRIVATE decoder_png.cc decoder_png.h)
-endif ()
-
 
-if (PNG_FOUND)
  add_executable(heif-thumbnailer ${getopt_sources}
  encoder.cc
  encoder.h
@@ -119,8 +111,7 @@ if (PNG_FOUND)
  ../libheif/exif.cc
  common.cc
  common.h)
- target_link_libraries(heif-thumbnailer heif ${PNG_LIBRARIES})
- target_include_directories(heif-thumbnailer PRIVATE ${PNG_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)

diff --git a/libheif/CMakeLists.txt b/libheif/CMakeLists.txt
@@ -117,11 +117,8 @@ endif ()
 
 if (WITH_DEFLATE_HEADER_COMPRESSION)
  find_package(ZLIB REQUIRED)
- if (ZLIB_FOUND)
- target_link_libraries(heif PRIVATE ${ZLIB_LIBRARIES})
- target_include_directories(heif PRIVATE ${ZLIB_INCLUDE_DIRS})
- target_compile_definitions(heif PRIVATE WITH_DEFLATE_HEADER_COMPRESSION=1)
- endif ()
+ target_link_libraries(heif PRIVATE ZLIB::ZLIB)
+ target_compile_definitions(heif PRIVATE WITH_DEFLATE_HEADER_COMPRESSION=1)
 endif ()
 
 if (ENABLE_MULTITHREADING_SUPPORT)