Merge pull request #5 from xsacha/hunter

Just link targets directly. No need to check.

CMakeLists.txt

@@ -88,11 +88,6 @@ endif()
 #
 ###############################################################################
 
-set(LIBRARY_TYPE SHARED)
-if (STATIC)
-    set(LIBRARY_TYPE)
-endif()
-
 if (WIN32)
     if (MSVC)
         add_definitions(-D_CRT_SECURE_NO_WARNINGS)

cmake/templates/LeptonicaConfig.cmake.in

@@ -22,6 +22,11 @@
 
 include(${CMAKE_CURRENT_LIST_DIR}/LeptonicaTargets.cmake)
 
+find_package(JPEG CONFIG REQUIRED)
+find_package(PNG CONFIG REQUIRED)
+find_package(TIFF CONFIG REQUIRED)
+find_package(ZLIB CONFIG REQUIRED)
+
 # ======================================================
 #  Version variables:
 # ======================================================

src/CMakeLists.txt

@@ -14,7 +14,7 @@ if (MSVC)
     set_source_files_properties(${src} PROPERTIES LANGUAGE CXX)
 endif()
 
-add_library                     (leptonica ${LIBRARY_TYPE} ${src} ${hdr})
+add_library                     (leptonica ${src} ${hdr})
 set_target_properties           (leptonica PROPERTIES VERSION   ${VERSION_PLAIN})
 set_target_properties           (leptonica PROPERTIES SOVERSION 5.1.0)
 if (WIN32)
@@ -29,24 +29,13 @@ endif()
 if (GIF_LIBRARY)
     target_link_libraries       (leptonica ${GIF_LIBRARY})
 endif()
-if (JPEG_LIBRARY)
-    target_link_libraries       (leptonica JPEG::jpeg)
-endif()
 if (JP2K_FOUND)
     target_link_libraries       (leptonica ${JP2K_LIBRARIES})
 endif()
-if (PNG_LIBRARY)
-    target_link_libraries       (leptonica PNG::png)
-endif()
-if (TIFF_LIBRARY)
-    target_link_libraries       (leptonica TIFF::libtiff)
-endif()
 if (WEBP_FOUND)
     target_link_libraries       (leptonica ${WEBP_LIBRARIES})
 endif()
-if (ZLIB_LIBRARY)
-    target_link_libraries       (leptonica ZLIB::zlib)
-endif()
+target_link_libraries           (leptonica PUBLIC JPEG::jpeg PNG::png TIFF::libtiff ZLIB::zlib)
 
 if (UNIX)
     target_link_libraries       (leptonica m)
@@ -68,7 +57,7 @@ else()
 endif()
 
 install(TARGETS leptonica EXPORT LeptonicaTargets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib INCLUDES DESTINATION include)
-install(EXPORT LeptonicaTargets DESTINATION lib/cmake/${PROJECT_NAME})
+install(EXPORT LeptonicaTargets NAMESPACE "Leptonica::" DESTINATION lib/cmake/${PROJECT_NAME})
 install(FILES
     ${hdr}
     ${CMAKE_BINARY_DIR}/src/endianness.h