diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-08-13 22:21:36 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-08-13 22:21:36 +0300 |
| commit | 4e03f9cbc2414a89c547b047db87789289787fdb (patch) | |
| tree | 1f96eda41365f4b145ad7aa135bc9bb196e28704 /build_files | |
| parent | 4a10ba2174eed4be5660221a08fd4a3c864c6bf8 (diff) | |
build_environment: fftw 3.3.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/fftw.cmake | 7 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/harvest.cmake | 3 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/build_files/build_environment/cmake/fftw.cmake b/build_files/build_environment/cmake/fftw.cmake index 3044e28078d..d85d7bc7538 100644 --- a/build_files/build_environment/cmake/fftw.cmake +++ b/build_files/build_environment/cmake/fftw.cmake @@ -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() diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index 49f444cb390..41656a5da0b 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -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/ && diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 4fd9ce4498e..49035a4feca 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -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) |