build_environment: fftw 3.3.8
authorRay Molenkamp <github@lazydodo.com>
Mon, 13 Aug 2018 19:21:36 +0000 (13:21 -0600)
committerRay Molenkamp <github@lazydodo.com>
Mon, 13 Aug 2018 19:21:36 +0000 (13:21 -0600)
build_files/build_environment/cmake/fftw.cmake
build_files/build_environment/cmake/harvest.cmake
build_files/build_environment/cmake/versions.cmake

index 3044e28078debc47010650f29f037b0a67597c6f..d85d7bc753883c54715e713d37f83611425526ef 100644 (file)
@@ -37,4 +37,11 @@ ExternalProject_Add(external_fftw3
 
 if(MSVC)
        set_target_properties(external_fftw3 PROPERTIES FOLDER Mingw)
+       if(BUILD_MODE STREQUAL Release)
+               ExternalProject_Add_Step(external_fftw3 after_install
+                       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/lib/libfftw3.a ${HARVEST_TARGET}/fftw3/lib/libfftw.lib
+                       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/include/fftw3.h ${HARVEST_TARGET}/fftw3/include/fftw3.h
+                       DEPENDEES install
+               )
+       endif()
 endif()
index 49f444cb3904e309d272e1dd0284e9aa7d4f2966..41656a5da0ba7b1585e44e0e18fcfa6c246baf9a 100644 (file)
@@ -45,9 +45,6 @@ if(BUILD_MODE STREQUAL Release)
                                # png
                                ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
                                ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
-                               # fftw3
-                               ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/lib/libfftw3.a ${HARVEST_TARGET}/fftw3/lib/libfftw.lib &&
-                               ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/include/fftw3.h ${HARVEST_TARGET}/fftw3/include/fftw3.h &&
                                # freeglut-> opengl
                                ${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
                                ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ &&
index 4fd9ce4498eb101b4cadb99ea21c354963bd0371..49035a4fecad54b66250657695f62efceb23805d 100644 (file)
@@ -217,9 +217,9 @@ set(FFMPEG_VERSION 4.0.2)
 set(FFMPEG_URI http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2)
 set(FFMPEG_HASH 5576e8a22f80b6a336db39808f427cfb)
 
-set(FFTW_VERSION 3.3.4)
+set(FFTW_VERSION 3.3.8)
 set(FFTW_URI http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz)
-set(FFTW_HASH 2edab8c06b24feeb3b82bbb3ebf3e7b3)
+set(FFTW_HASH 8aac833c943d8e90d51b697b27d4384d)
 
 set(ICONV_VERSION 1.14)
 set(ICONV_URI http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz)