Fixed android, windows, mingw, mysys, and osx

Unfortunately, this means that we need to disable gif2webp command line utility for these target platforms. We will revisit this patch once giflib becomes fully supported.

Author: mean-ui-thread

CMakeLists.txt

@@ -8,11 +8,6 @@ HunterGate(
 
 project(libwebp C)
 
-hunter_add_package(PNG)
-hunter_add_package(Jpeg)
-hunter_add_package(TIFF)
-hunter_add_package(giflib)
-
 # Options for coder / decoder executables.
 option(WEBP_ENABLE_SIMD "Enable any SIMD optimization." ON)
 option(WEBP_BUILD_CWEBP "Build the cwebp command line tool." OFF)
@@ -54,7 +49,7 @@ if(ANDROID)
   add_library(cpufeatures STATIC
     ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c
   )
-  target_link_libraries(cpufeatures dl)
+  target_link_libraries(cpufeatures PUBLIC dl)
   set(WEBP_DEP_LIBRARIES ${WEBP_DEP_LIBRARIES} cpufeatures)
   set(WEBP_DEP_INCLUDE_DIRS ${WEBP_DEP_INCLUDE_DIRS}
     ${ANDROID_NDK}/sources/android/cpufeatures
@@ -127,7 +122,7 @@ add_library(webputilsdecode OBJECT ${WEBP_UTILS_COMMON_SRCS}
   ${WEBP_UTILS_DEC_SRCS})
 add_library(webpdecoder $<TARGET_OBJECTS:webpdecode>
   $<TARGET_OBJECTS:webpdspdecode> $<TARGET_OBJECTS:webputilsdecode>)
-target_link_libraries(webpdecoder ${WEBP_DEP_LIBRARIES})
+target_link_libraries(webpdecoder PUBLIC ${WEBP_DEP_LIBRARIES})
 
 # Build the webp library.
 add_library(webpencode OBJECT ${WEBP_ENC_SRCS})
@@ -137,7 +132,7 @@ add_library(webputils OBJECT ${WEBP_UTILS_COMMON_SRCS} ${WEBP_UTILS_DEC_SRCS}
   ${WEBP_UTILS_ENC_SRCS})
 add_library(webp $<TARGET_OBJECTS:webpdecode> $<TARGET_OBJECTS:webpdsp>
   $<TARGET_OBJECTS:webpencode> $<TARGET_OBJECTS:webputils>)
-target_link_libraries(webp ${WEBP_DEP_LIBRARIES})
+target_link_libraries(webp PUBLIC ${WEBP_DEP_LIBRARIES})
 
 # Make sure the OBJECT libraries are built with position independent code
 # (it is not ON by default).
@@ -146,7 +141,7 @@ set_target_properties(webpdecode webpdspdecode webputilsdecode
 
 # Build the webp demux library.
 add_library(webpdemux ${WEBP_DEMUX_SRCS})
-target_link_libraries(webpdemux webp)
+target_link_libraries(webpdemux PUBLIC webp)
 
 # Set the version numbers.
 function(parse_version FILE NAME VAR)
@@ -169,6 +164,9 @@ set_target_properties(webpdemux PROPERTIES VERSION ${PACKAGE_VERSION}
 
 # Define the libraries to install.
 set(INSTALLED_LIBRARIES webpdecoder webp webpdemux)
+if(ANDROID)
+    list(APPEND INSTALLED_LIBRARIES cpufeatures)
+endif()
 
 ### Deal with SIMD.
 # Change the compile flags for SIMD files we use.
@@ -198,19 +196,19 @@ if(WEBP_BUILD_CWEBP OR WEBP_BUILD_DWEBP OR
   parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEIOUTILS_SRCS"
     "imageio_util_[^ ]*")
   add_library(imageioutil ${IMAGEIOUTILS_SRCS})
-  target_link_libraries(imageioutil webp)
+  target_link_libraries(imageioutil PUBLIC webp ${WEBP_DEP_IMG_LIBRARIES})
 
   # Image-decoding utility library.
   parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEDEC_SRCS"
     "imagedec_[^ ]*")
   add_library(imagedec ${IMAGEDEC_SRCS})
-  target_link_libraries(imagedec imageioutil webp ${WEBP_DEP_IMG_LIBRARIES})
+  target_link_libraries(imagedec PUBLIC imageioutil webp ${WEBP_DEP_IMG_LIBRARIES})
 
   # Image-encoding utility library.
   parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEENC_SRCS"
     "imageenc_[^ ]*")
   add_library(imageenc ${IMAGEENC_SRCS})
-  target_link_libraries(imageenc webp)
+  target_link_libraries(imageenc PUBLIC webp ${WEBP_DEP_IMG_LIBRARIES})
 
   set_property(TARGET exampleutil imageioutil imagedec imageenc
     PROPERTY INCLUDE_DIRECTORIES
@@ -249,7 +247,7 @@ if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP)
   parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS"
     "")
   add_library(webpmux ${WEBP_MUX_SRCS})
-  target_link_libraries(webpmux webp)
+  target_link_libraries(webpmux PUBLIC webp)
   parse_version(mux/Makefile.am webpmux WEBP_MUX_SOVERSION)
   set_target_properties(webpmux PROPERTIES VERSION ${PACKAGE_VERSION}
     SOVERSION ${WEBP_MUX_SOVERSION})

cmake/cpu.cmake

@@ -46,7 +46,7 @@ set(WEBP_SIMD_FILES_TO_INCLUDE)
 set(WEBP_SIMD_FLAGS_TO_INCLUDE)
 
 if(${ANDROID})
-  if(${ANDROID_ABI} STREQUAL "armeabi-v7a")
+  if(${CMAKE_ANDROID_ARCH_ABI} STREQUAL "armeabi-v7a")
     # This is because Android studio uses the configuration
     # "-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16"
     # that does not trigger neon optimizations but should

cmake/deps.cmake

@@ -62,20 +62,35 @@ if(MATH_LIBRARY)
   list(APPEND WEBP_DEP_LIBRARIES ${MATH_LIBRARY})
 endif()
 
+hunter_add_package(PNG)
 find_package(PNG CONFIG REQUIRED)
-find_package(JPEG CONFIG REQUIRED)
-find_package(TIFF CONFIG REQUIRED)
-find_package(giflib CONFIG REQUIRED)
+list(APPEND WEBP_DEP_IMG_LIBRARIES PNG::png)
 set(WEBP_HAVE_PNG 1)
-set(WEBP_HAVE_JPEG 1)
-set(WEBP_HAVE_TIFF 1)
-set(WEBP_HAVE_GIF 1)
 set(PNG_FOUND 1)
+
+hunter_add_package(Jpeg)
+find_package(JPEG CONFIG REQUIRED)
+list(APPEND WEBP_DEP_IMG_LIBRARIES JPEG::jpeg)
+set(WEBP_HAVE_JPEG 1)
 set(JPEG_FOUND 1)
+
+hunter_add_package(TIFF)
+find_package(TIFF CONFIG REQUIRED)
+list(APPEND WEBP_DEP_IMG_LIBRARIES TIFF::libtiff)
+set(WEBP_HAVE_TIFF 1)
 set(TIFF_FOUND 1)
-set(GIF_FOUND 1)
-list(APPEND WEBP_DEP_IMG_LIBRARIES PNG::png JPEG::jpeg TIFF::libtiff)
-list(APPEND WEBP_DEP_GIF_LIBRARIES giflib::giflib)
+
+if(ANDROID OR MINGW OR MSYS OR CYGWIN)
+    # giflib is currently not supported by hunter on Android, MinGW and MSYS
+    set(WEBP_HAVE_GIF 0)
+    set(GIF_FOUND 0)
+else()
+    hunter_add_package(giflib)
+    find_package(giflib CONFIG REQUIRED)
+    list(APPEND WEBP_DEP_GIF_LIBRARIES giflib::giflib)
+    set(WEBP_HAVE_GIF 1)
+    set(GIF_FOUND 1)
+endif()
 
 ## Check for specific headers.
 include(CheckIncludeFiles)