mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-04 13:59:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix linking between third party projects

Browse Source
This commit is contained in:
David Capello 2018-04-03 11:11:10 -03:00
parent 86177791d6
commit 1571fac5a3
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -268,7 +268,9 @@ include_directories(${HARFBUZZ_INCLUDE_DIRS})
if(USE_SHARED_GIFLIB)
find_package(GIF REQUIRED)
else()
set(GIF_LIBRARY giflib)
set(GIF_LIBRARIES giflib)
set(GIF_INCLUDE_DIR ${GIFLIB_DIR}/lib)
set(GIF_INCLUDE_DIRS ${GIFLIB_DIR}/lib)
endif()
include_directories(${GIF_INCLUDE_DIRS})

13
third_party/CMakeLists.txt vendored
View File

@ -35,6 +35,15 @@ if(NOT USE_SHARED_GIFLIB)
endif()
if(WITH_WEBP_SUPPORT)
if(NOT USE_SHARED_LIBPNG)
set(PNG_PNG_INCLUDE_DIR ${LIBPNG_DIR} CACHE STRING "")
set(PNG_LIBRARY $<TARGET_FILE:png_static> CACHE FILEPATH "")
endif()
if(NOT USE_SHARED_JPEGLIB)
set(JPEG_INCLUDE_DIR ${LIBJPEG_DIR} CACHE STRING "")
set(JPEG_LIBRARY $<TARGET_FILE:jpeg> CACHE FILEPATH "")
endif()
# Enable img2webp so "webpmux" library is built
set(WEBP_BUILD_IMG2WEBP ON CACHE BOOL "Build the img2webp animation tool.")
add_subdirectory(libwebp)
@ -84,6 +93,10 @@ if(NOT USE_SHARED_FREETYPE)
endif()
if(NOT USE_SHARED_HARFBUZZ)
if(NOT USE_SHARED_FREETYPE)
set(ENV{FREETYPE_DIR} ${FREETYPE_DIR})
set(FREETYPE_LIBRARY $<TARGET_FILE:freetype> CACHE FILEPATH "")
endif()
set(HB_HAVE_FREETYPE ON CACHE BOOL "Enable freetype interop helpers")
set(HB_HAVE_GRAPHITE2 OFF CACHE BOOL "Enable Graphite2 complementary shaper")
set(HB_BUILTIN_UCDN ON CACHE BOOL "Use HarfBuzz provided UCDN")