From dcbc1c881a001f45081834a47391d673c1b96907 Mon Sep 17 00:00:00 2001 From: James Zern Date: Thu, 6 Jul 2017 11:45:47 -0700 Subject: [PATCH] cmake: split gif detection from IMG deps gifdec isn't part of imageio lib, it's only used by gif2webp. Change-Id: I70bff378a32f8fb2ebb8a5a7701049ffff7f7992 --- CMakeLists.txt | 4 ++-- cmake/config.h.cmake | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1199ba68..522df1c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -228,12 +228,12 @@ endif() if(WEBP_BUILD_GIF2WEBP) # gif2webp - include_directories(${WEBP_DEP_IMG_INCLUDE_DIRS}) + include_directories(${WEBP_DEP_GIF_INCLUDE_DIRS}) parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "GIF2WEBP_SRCS" "gif2webp") add_executable(gif2webp ${GIF2WEBP_SRCS}) target_link_libraries(gif2webp exampleutil imageioutil webp webpmux - ${WEBP_DEP_IMG_LIBRARIES}) + ${WEBP_DEP_GIF_LIBRARIES}) install(TARGETS gif2webp RUNTIME DESTINATION bin) endif() diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 0aade0c0..20f62d06 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -65,7 +65,7 @@ endif() # Find the standard image libraries. set(WEBP_DEP_IMG_LIBRARIES) set(WEBP_DEP_IMG_INCLUDE_DIRS) -foreach(I_LIB PNG JPEG TIFF GIF) +foreach(I_LIB PNG JPEG TIFF) find_package(${I_LIB}) set(WEBP_HAVE_${I_LIB} ${${I_LIB}_FOUND}) if(${I_LIB}_FOUND) @@ -74,6 +74,16 @@ foreach(I_LIB PNG JPEG TIFF GIF) endif() endforeach() +# GIF detection, gifdec isn't part of the imageio lib. +set(WEBP_DEP_GIF_LIBRARIES) +set(WEBP_DEP_GIF_INCLUDE_DIRS) +find_package(GIF) +set(WEBP_HAVE_GIF ${GIF_FOUND}) +if(GIF_FOUND) + list(APPEND WEBP_DEP_GIF_LIBRARIES ${GIF_LIBRARIES}) + list(APPEND WEBP_DEP_GIF_INCLUDE_DIRS ${GIF_INCLUDE_DIR}) +endif() + ## Check for specific headers. include(CheckIncludeFiles) check_include_files("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)