Commit c296761a authored by Sharaf Zaman's avatar Sharaf Zaman

Android: Add optional dependency FFTW3 to the build

Maniphest: T10784
parent 9d9b4efb
...@@ -22,7 +22,7 @@ ExternalProject_Add( ext_fftw3 ...@@ -22,7 +22,7 @@ ExternalProject_Add( ext_fftw3
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch_mingw.patch PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch_mingw.patch
INSTALL_DIR ${PREFIX_ext_fftw3} INSTALL_DIR ${PREFIX_ext_fftw3}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_fftw3} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -ENABLE_SSE=ON -ENABLE_SSE2=ON -DBUILD_TESTS=OFF CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_fftw3} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -ENABLE_SSE=ON -ENABLE_SSE2=ON -DBUILD_TESTS=OFF -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI}
UPDATE_COMMAND "" UPDATE_COMMAND ""
) )
......
...@@ -654,6 +654,8 @@ endif() ...@@ -654,6 +654,8 @@ endif()
if (ANDROID) if (ANDROID)
set (TIFF_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/i/lib/libtiff.so) set (TIFF_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/i/lib/libtiff.so)
set (TIFF_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/i/include}) set (TIFF_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/i/include})
set (FFTW3_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/i/lib/libfftw3.so)
set (FFTW3_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/i/)
endif() endif()
...@@ -725,6 +727,9 @@ set_package_properties(FFTW3 PROPERTIES ...@@ -725,6 +727,9 @@ set_package_properties(FFTW3 PROPERTIES
TYPE OPTIONAL TYPE OPTIONAL
PURPOSE "Required by the Krita for fast convolution operators and some G'Mic features") PURPOSE "Required by the Krita for fast convolution operators and some G'Mic features")
macro_bool_to_01(FFTW3_FOUND HAVE_FFTW3) macro_bool_to_01(FFTW3_FOUND HAVE_FFTW3)
if (FFTW3_FOUND)
list (APPEND ANDROID_EXTRA_LIBS ${FFTW3_LIBRARY})
endif()
find_package(OCIO) find_package(OCIO)
set_package_properties(OCIO PROPERTIES set_package_properties(OCIO 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