From f749c3cbb933d5e3dea21ebaeb019b5571db2fbd Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Mon, 13 Aug 2018 11:35:58 -0600 Subject: [PATCH 1/5] build_environment: alembic 1.7.8 --- .../build_environment/cmake/alembic.cmake | 29 +++++++++++++++---- .../build_environment/cmake/harvest.cmake | 4 --- .../build_environment/cmake/openexr.cmake | 2 +- .../build_environment/cmake/versions.cmake | 6 ++-- 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/build_files/build_environment/cmake/alembic.cmake b/build_files/build_environment/cmake/alembic.cmake index cf2cefa2e7a..b6d7105c7c4 100644 --- a/build_files/build_environment/cmake/alembic.cmake +++ b/build_files/build_environment/cmake/alembic.cmake @@ -40,10 +40,10 @@ set(ALEMBIC_EXTRA_ARGS -DBoost_NO_SYSTEM_PATHS=ON -DILMBASE_ROOT=${LIBDIR}/ilmbase -DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${LIBDIR}/ilmbase/include/OpenEXR - -DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${LIBEXT} - -DALEMBIC_ILMBASE_IMATH_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_2${LIBEXT} - -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT} - -DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${LIBEXT} + -DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half-2_3_s${LIBEXT} + -DALEMBIC_ILMBASE_IEXMATH_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_3_s${LIBEXT} + -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_3_s${LIBEXT} + -DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_3_s${LIBEXT} -DUSE_PYILMBASE=0 -DUSE_PYALEMBIC=0 -DUSE_ARNOLD=0 @@ -54,7 +54,7 @@ set(ALEMBIC_EXTRA_ARGS -DHDF5_ROOT=${LIBDIR}/hdf5 -DUSE_TESTS=Off -DALEMBIC_NO_OPENGL=1 - -DUSE_BINARIES=ON + -DUSE_BINARIES=OFF -DALEMBIC_ILMBASE_LINK_STATIC=On -DALEMBIC_SHARED_LIBS=OFF -DGLUT_INCLUDE_DIR="" @@ -68,13 +68,32 @@ ExternalProject_Add(external_alembic DOWNLOAD_DIR ${DOWNLOAD_DIR} URL_HASH MD5=${ALEMBIC_MD5} PREFIX ${BUILD_DIR}/alembic + PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/openexr/src/external_openexr/cmake ${BUILD_DIR}/alembic/src/external_alembic/cmake/modules CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/alembic -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ALEMBIC_EXTRA_ARGS} INSTALL_DIR ${LIBDIR}/alembic ) +if(WIN32) + if(BUILD_MODE STREQUAL Release) + ExternalProject_Add_Step(external_alembic after_install + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/alembic ${HARVEST_TARGET}/alembic + DEPENDEES install + ) + endif() + if(BUILD_MODE STREQUAL Debug) + ExternalProject_Add_Step(external_alembic after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/alembic/lib/alembic.lib ${HARVEST_TARGET}/alembic/lib/alembic_d.lib && + DEPENDEES install + ) + endif() +endif() + + + add_dependencies( external_alembic external_boost external_zlib external_ilmbase + external_openexr ) diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index ece9716686f..4040f97df92 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -82,8 +82,6 @@ if(BUILD_MODE STREQUAL Release) ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencollada/ ${HARVEST_TARGET}/opencollada/ && # opensubdiv ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv ${HARVEST_TARGET}/opensubdiv && - # alembic - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/alembic ${HARVEST_TARGET}/alembic && # BlendThumb ${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb64/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb64.dll && ${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb32/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb.dll && @@ -133,8 +131,6 @@ if(BUILD_MODE STREQUAL Debug) ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib && # python ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/ && - # alembic - ${CMAKE_COMMAND} -E copy ${LIBDIR}/alembic/lib/alembic.lib ${HARVEST_TARGET}/alembic/lib/alembic_d.lib && # hdf5 ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib && # numpy diff --git a/build_files/build_environment/cmake/openexr.cmake b/build_files/build_environment/cmake/openexr.cmake index e7222478090..6c17f3ed580 100644 --- a/build_files/build_environment/cmake/openexr.cmake +++ b/build_files/build_environment/cmake/openexr.cmake @@ -19,12 +19,12 @@ if(WIN32) set(OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}") set(OPENEXR_EXTRA_ARGS - -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=${OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES} -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY} -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/ -DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase -DOPENEXR_BUILD_STATIC=On + -DOPENEXR_BUILD_SHARED=Off -DOPENEXR_BUILD_PYTHON_LIBS=Off ) ExternalProject_Add(external_openexr diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 447bf82bfb4..4fd9ce4498e 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -74,9 +74,9 @@ set(HDF5_VERSION 1.8.17) set(HDF5_URI https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-${HDF5_VERSION}/src/hdf5-${HDF5_VERSION}.tar.gz) set(HDF5_HASH 7d572f8f3b798a628b8245af0391a0ca) -set(ALEMBIC_VERSION 1.7.1) -set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.zip) -set(ALEMBIC_MD5 cf7705055501d5ea0cb8256866496f79) +set(ALEMBIC_VERSION 1.7.8) +set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.tar.gz) +set(ALEMBIC_MD5 d095c2feb5e183b824904db7b63c1d30) ## hash is for 3.1.2 set(GLFW_GIT_UID 30306e54705c3adae9fe082c816a3be71963485c) From 4a10ba2174eed4be5660221a08fd4a3c864c6bf8 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Mon, 13 Aug 2018 12:37:12 -0600 Subject: [PATCH 2/5] build_environment: openexr support debug build. --- build_files/build_environment/cmake/harvest.cmake | 12 ------------ build_files/build_environment/cmake/ilmbase.cmake | 9 +++++++++ build_files/build_environment/cmake/openexr.cmake | 14 +++++++++++++- build_files/build_environment/cmake/options.cmake | 6 +++++- 4 files changed, 27 insertions(+), 14 deletions(-) diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index 4040f97df92..49f444cb390 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -42,10 +42,6 @@ if(BUILD_MODE STREQUAL Release) ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib && ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe && - # openEXR - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ilmbase ${HARVEST_TARGET}/openexr && - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib && - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include && # 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/ && @@ -98,14 +94,6 @@ if(BUILD_MODE STREQUAL Debug) # OpenImageIO COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib && ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib && - # ilmbase+openexr - ${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/Half.lib ${HARVEST_TARGET}/openexr/lib/Half_d.lib && - ${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/Iex-2_2.lib ${HARVEST_TARGET}/openexr/lib/Iex-2_2_d.lib && - ${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/IexMath-2_2.lib ${HARVEST_TARGET}/openexr/lib/IexMath-2_2_d.lib && - ${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/IlmThread-2_2.lib ${HARVEST_TARGET}/openexr/lib/IlmThread-2_2_d.lib && - ${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/Imath-2_2.lib ${HARVEST_TARGET}/openexr/lib/Imath-2_2_d.lib && - ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/lib/IlmImf-2_2.lib ${HARVEST_TARGET}/openexr/lib/IlmImf-2_2_d.lib && - ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/lib/IlmImfUtil-2_2.lib ${HARVEST_TARGET}/openexr/lib/IlmImfUtil-2_2_d.lib && # opencollada ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/buffer.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/buffer_d.lib && ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/ftoa.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/ftoa_d.lib && diff --git a/build_files/build_environment/cmake/ilmbase.cmake b/build_files/build_environment/cmake/ilmbase.cmake index d03485b0a1e..4863cc6865a 100644 --- a/build_files/build_environment/cmake/ilmbase.cmake +++ b/build_files/build_environment/cmake/ilmbase.cmake @@ -22,6 +22,7 @@ if(WIN32) -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=${ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES} ) + ExternalProject_Add(external_ilmbase URL ${ILMBASE_URI} DOWNLOAD_DIR ${DOWNLOAD_DIR} @@ -30,6 +31,14 @@ if(WIN32) CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ilmbase ${DEFAULT_CMAKE_FLAGS} ${ILMBASE_EXTRA_ARGS} INSTALL_DIR ${LIBDIR}/openexr ) + + if(BUILD_MODE STREQUAL Release) + ExternalProject_Add_Step(external_ilmbase after_install + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ilmbase ${HARVEST_TARGET}/openexr + DEPENDEES install + ) + endif() + else() set(ILMBASE_EXTRA_ARGS --enable-static diff --git a/build_files/build_environment/cmake/openexr.cmake b/build_files/build_environment/cmake/openexr.cmake index 6c17f3ed580..2aa167a4be5 100644 --- a/build_files/build_environment/cmake/openexr.cmake +++ b/build_files/build_environment/cmake/openexr.cmake @@ -23,9 +23,14 @@ if(WIN32) -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY} -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/ -DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase + -DOPENEXR_BUILD_ILMBASE=On + -DOPENEXR_BUILD_OPENEXR=On + -DOPENEXR_BUILD_PYTHON_LIBS=Off -DOPENEXR_BUILD_STATIC=On -DOPENEXR_BUILD_SHARED=Off - -DOPENEXR_BUILD_PYTHON_LIBS=Off + -DOPENEXR_BUILD_TESTS=Off + -DOPENEXR_BUILD_VIEWERS=Off + -DOPENEXR_BUILD_UTILS=Off ) ExternalProject_Add(external_openexr URL ${OPENEXR_URI} @@ -35,6 +40,13 @@ if(WIN32) CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS} INSTALL_DIR ${LIBDIR}/openexr ) + + ExternalProject_Add_Step(external_openexr after_install + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include + DEPENDEES install + ) + else() set(OPENEXR_PKG_CONFIG_PATH ${LIBDIR}/zlib/share/pkgconfig) set(OPENEXR_EXTRA_ARGS diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake index c4dcf212e68..b8efb1bda95 100644 --- a/build_files/build_environment/cmake/options.cmake +++ b/build_files/build_environment/cmake/options.cmake @@ -202,7 +202,11 @@ endif() if(WIN32) - set(ZLIB_LIBRARY zlibstatic${LIBEXT}) + if(BUILD_MODE STREQUAL Debug) + set(ZLIB_LIBRARY zlibstaticd${LIBEXT}) + else() + set(ZLIB_LIBRARY zlibstatic${LIBEXT}) + endif() else() set(ZLIB_LIBRARY libz${LIBEXT}) endif() From 4e03f9cbc2414a89c547b047db87789289787fdb Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Mon, 13 Aug 2018 13:21:36 -0600 Subject: [PATCH 3/5] build_environment: fftw 3.3.8 --- build_files/build_environment/cmake/fftw.cmake | 7 +++++++ build_files/build_environment/cmake/harvest.cmake | 3 --- 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) From 518ce887ad9b6a9ab56e64e4f5784b5ff31a7aec Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Mon, 13 Aug 2018 14:45:27 -0600 Subject: [PATCH 4/5] build_environment: iconv 1.15 --- build_files/build_environment/cmake/harvest.cmake | 3 --- build_files/build_environment/cmake/iconv.cmake | 7 +++++++ build_files/build_environment/cmake/versions.cmake | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index 41656a5da0b..b5b9eef7bb2 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -58,9 +58,6 @@ if(BUILD_MODE STREQUAL Release) # tiff ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/ && - # iconv - ${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/lib/libiconv.a ${HARVEST_TARGET}/iconv/lib/iconv.lib && - ${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/include/iconv.h ${HARVEST_TARGET}/iconv/include/iconv.h && # opencolorIO ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenColorIO/ ${HARVEST_TARGET}/opencolorio && ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenColorIO/lib/OpenColorIO.dll ${HARVEST_TARGET}/opencolorio/bin/OpenColorIO.dll && diff --git a/build_files/build_environment/cmake/iconv.cmake b/build_files/build_environment/cmake/iconv.cmake index cd6cf9547df..18f8f60b4f5 100644 --- a/build_files/build_environment/cmake/iconv.cmake +++ b/build_files/build_environment/cmake/iconv.cmake @@ -31,4 +31,11 @@ ExternalProject_Add(external_iconv if(MSVC) set_target_properties(external_iconv PROPERTIES FOLDER Mingw) + if(BUILD_MODE STREQUAL Release) + ExternalProject_Add_Step(external_iconv after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/lib/libiconv.a ${HARVEST_TARGET}/iconv/lib/iconv.lib + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/include/iconv.h ${HARVEST_TARGET}/iconv/include/iconv.h + DEPENDEES install + ) + endif() endif() diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 49035a4feca..7559cb5100f 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -221,9 +221,9 @@ set(FFTW_VERSION 3.3.8) set(FFTW_URI http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz) set(FFTW_HASH 8aac833c943d8e90d51b697b27d4384d) -set(ICONV_VERSION 1.14) +set(ICONV_VERSION 1.15) set(ICONV_URI http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz) -set(ICONV_HASH e34509b1623cec449dfeb73d7ce9c6c6) +set(ICONV_HASH ace8b5f2db42f7b3b3057585e80d9808) set(LAPACK_VERSION 3.6.0) set(LAPACK_URI http://www.netlib.org/lapack/lapack-${LAPACK_VERSION}.tgz) From e24cd10245ec5754009db5417289b68d5d69ff14 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Mon, 13 Aug 2018 14:56:49 -0600 Subject: [PATCH 5/5] build_environment: Remove lapack --- build_files/build_environment/CMakeLists.txt | 1 - .../build_environment/cmake/lapack.cmake | 43 ------------------- 2 files changed, 44 deletions(-) delete mode 100644 build_files/build_environment/cmake/lapack.cmake diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt index 1ca102508e1..8376306caa1 100644 --- a/build_files/build_environment/CMakeLists.txt +++ b/build_files/build_environment/CMakeLists.txt @@ -118,7 +118,6 @@ if(NOT WIN32 OR ENABLE_MINGW64) include(cmake/sndfile.cmake) if(WIN32) include(cmake/iconv.cmake) - include(cmake/lapack.cmake) endif() if(UNIX) include(cmake/flac.cmake) diff --git a/build_files/build_environment/cmake/lapack.cmake b/build_files/build_environment/cmake/lapack.cmake deleted file mode 100644 index 3110503db52..00000000000 --- a/build_files/build_environment/cmake/lapack.cmake +++ /dev/null @@ -1,43 +0,0 @@ -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# ***** END GPL LICENSE BLOCK ***** - -set(LAPACK_EXTRA_ARGS) - -if(WIN32) - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - set(LAPACK_EXTRA_ARGS -G "MSYS Makefiles" -DCMAKE_Fortran_COMPILER=${DOWNLOAD_DIR}/mingw/mingw64/bin/gfortran.exe) - else() - set(LAPACK_EXTRA_ARGS -G "MSYS Makefiles" -DCMAKE_Fortran_COMPILER=${DOWNLOAD_DIR}/mingw/mingw32/bin/gfortran.exe) - endif() -endif() - -ExternalProject_Add(external_lapack - URL ${LAPACK_URI} - DOWNLOAD_DIR ${DOWNLOAD_DIR} - URL_HASH MD5=${LAPACK_HASH} - PREFIX ${BUILD_DIR}/lapack - CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lapack/src/external_lapack/ && ${CMAKE_COMMAND} ${LAPACK_EXTRA_ARGS} -DBUILD_TESTING=Off -DCMAKE_INSTALL_PREFIX=${LIBDIR}/lapack . - BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lapack/src/external_lapack/ && make -j${MAKE_THREADS} - INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lapack/src/external_lapack/ && make install - - INSTALL_DIR ${LIBDIR}/lapack -) - -if(MSVC) - set_target_properties(external_lapack PROPERTIES FOLDER Mingw) -endif()