[PATCH 4/4] Use 32-bit fftw DLLs when compiling for x86
alvinhochun+krita at gmail.com
alvinhochun+krita at gmail.com
Sat Sep 24 19:33:19 UTC 2016
From: Alvin Wong <alvinhochun at gmail.com>
---
3rdparty/ext_fftw3/CMakeLists.txt | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/3rdparty/ext_fftw3/CMakeLists.txt b/3rdparty/ext_fftw3/CMakeLists.txt
index 76a9266..8baba64 100755
--- a/3rdparty/ext_fftw3/CMakeLists.txt
+++ b/3rdparty/ext_fftw3/CMakeLists.txt
@@ -34,6 +34,7 @@ if (MSVC)
)
endif()
elseif (MINGW)
+ if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
ExternalProject_Add( ext_fftw3
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/fftw-3.3.4-dll64.zip
@@ -41,7 +42,23 @@ elseif (MINGW)
INSTALL_DIR ${PREFIX_ext_fftw3}
CONFIGURE_COMMAND ""
- BUILD_COMMAND ${CMAKE_COMMAND} -E echo deploying fftw3 64 binary
+ BUILD_COMMAND ${CMAKE_COMMAND} -E echo deploying fftw3 64-bit binary
+ INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/bin ${PREFIX_ext_fftw3}/bin
+ COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/lib ${PREFIX_ext_fftw3}/lib
+ COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/include ${PREFIX_ext_fftw3}/include
+
+ UPDATE_COMMAND ""
+ ALWAYS 0
+ )
+ else("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+ ExternalProject_Add( ext_fftw3
+ DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+ URL http://files.kde.org/krita/build/dependencies/fftw-3.3.4-dll32.zip
+ URL_MD5 03754fe2a7fbaf983b0cc9a728e0a5b3
+
+ INSTALL_DIR ${PREFIX_ext_fftw3}
+ CONFIGURE_COMMAND ""
+ BUILD_COMMAND ${CMAKE_COMMAND} -E echo deploying fftw3 32-bit binary
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/bin ${PREFIX_ext_fftw3}/bin
COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/lib ${PREFIX_ext_fftw3}/lib
COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/include ${PREFIX_ext_fftw3}/include
@@ -49,6 +66,7 @@ elseif (MINGW)
UPDATE_COMMAND ""
ALWAYS 0
)
+ endif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
else ()
ExternalProject_Add( ext_fftw3
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
--
2.5.0.windows.1
More information about the kimageshop
mailing list