Commit 9d9b4efb authored by Sharaf Zaman's avatar Sharaf Zaman

Android: Add optional dependency libtiff to the build

Maniphest: T10784
parent d5e174a7
......@@ -5,7 +5,7 @@ ExternalProject_Add( ext_tiff
URL_MD5 54bad211279cc93eb4fca31ba9bfdc79
INSTALL_DIR ${EXTPREFIX_tiff}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_tiff} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_tiff} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI}
UPDATE_COMMAND ""
)
......@@ -651,6 +651,11 @@ endif()
############################
###########################
if (ANDROID)
set (TIFF_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/i/lib/libtiff.so)
set (TIFF_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/i/include})
endif()
find_package(ZLIB)
set_package_properties(ZLIB PROPERTIES
......@@ -680,6 +685,9 @@ set_package_properties(TIFF PROPERTIES
URL "http://www.remotesensing.org/libtiff"
TYPE OPTIONAL
PURPOSE "Required by the Krita TIFF filter")
if (TIFF_FOUND)
list (APPEND ANDROID_EXTRA_LIBS ${TIFF_LIBRARY})
endif()
find_package(JPEG)
set_package_properties(JPEG PROPERTIES
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment