diff options
author | Ray Molenkamp <github@lazydodo.com> | 2018-08-12 00:34:11 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2018-08-12 00:34:11 +0300 |
commit | 9d59851ca3d68fdee221f050c9f4a69ca085b432 (patch) | |
tree | b21d0d7b42b8266ba2e8fd2ec5716403b437b954 | |
parent | 9267d29bfbce36a60efdc0843ec5760cec8d8090 (diff) |
build_environment: blosc 1.14.4
-rw-r--r-- | build_files/build_environment/cmake/blosc.cmake | 19 | ||||
-rw-r--r-- | build_files/build_environment/cmake/harvest.cmake | 5 | ||||
-rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 6 | ||||
-rw-r--r-- | build_files/build_environment/patches/blosc.diff | 28 |
4 files changed, 34 insertions, 24 deletions
diff --git a/build_files/build_environment/cmake/blosc.cmake b/build_files/build_environment/cmake/blosc.cmake index 9a5ef745985..02f98dfe1f3 100644 --- a/build_files/build_environment/cmake/blosc.cmake +++ b/build_files/build_environment/cmake/blosc.cmake @@ -33,7 +33,7 @@ ExternalProject_Add(external_blosc DOWNLOAD_DIR ${DOWNLOAD_DIR} URL_HASH MD5=${BLOSC_HASH} PREFIX ${BUILD_DIR}/blosc - PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/blosc/src/external_blosc < ${PATCH_DIR}/blosc.diff + #PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/blosc/src/external_blosc < ${PATCH_DIR}/blosc.diff CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blosc ${DEFAULT_CMAKE_FLAGS} ${BLOSC_EXTRA_ARGS} INSTALL_DIR ${LIBDIR}/blosc ) @@ -48,3 +48,20 @@ if(WIN32) external_pthreads ) endif() + +if (WIN32) + if(BUILD_MODE STREQUAL Release) + ExternalProject_Add_Step(external_blosc after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc.lib ${HARVEST_TARGET}/blosc/lib/libblosc.lib + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/blosc/include/ ${HARVEST_TARGET}/blosc/include/ + DEPENDEES install + ) + endif() + if(BUILD_MODE STREQUAL Debug) + ExternalProject_Add_Step(external_blosc after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc_d.lib ${HARVEST_TARGET}/blosc/lib/libblosc_d.lib + DEPENDEES install + ) + endif() +endif() + diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index 860800f05b8..277e414a7d9 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -78,9 +78,6 @@ if(BUILD_MODE STREQUAL Release) ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/osl/ ${HARVEST_TARGET}/osl && # OpenVDB ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openVDB/ ${HARVEST_TARGET}/openVDB && - # blosc - ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc.lib ${HARVEST_TARGET}/blosc/lib/libblosc.lib && - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/blosc/include/ ${HARVEST_TARGET}/blosc/include/ && # tbb ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tbb/include/ ${HARVEST_TARGET}/tbb/include/ && @@ -126,8 +123,6 @@ if(BUILD_MODE STREQUAL Debug) ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/pcre.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/pcre_d.lib && ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/UTF.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/UTF_d.lib && ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/xml.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/xml_d.lib && - # blosc - ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc_d.lib ${HARVEST_TARGET}/blosc/lib/libblosc_d.lib && # osl ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslcomp.lib ${HARVEST_TARGET}/osl/lib/oslcomp_d.lib && ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslexec.lib ${HARVEST_TARGET}/osl/lib/oslexec_d.lib && diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 490688016a4..27cd1d200e0 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -37,9 +37,9 @@ set(BOOST_VERSION_NODOTS 1_68_0) set(BOOST_URI https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz) set(BOOST_HASH 5d8b4503582fffa9eefdb9045359c239) -set(BLOSC_VERSION 1.7.1) -set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.zip) -set(BLOSC_HASH ff5cc729a5a25934ef714217218eed26) +set(BLOSC_VERSION 1.14.4) +set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz) +set(BLOSC_HASH e80dfc71e4cba03b8d01ed0876547ffe) set(PTHREADS_VERSION 2-9-1) set(PTHREADS_URI ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-${PTHREADS_VERSION}-release.tar.gz) diff --git a/build_files/build_environment/patches/blosc.diff b/build_files/build_environment/patches/blosc.diff index 3bd6ef28144..2c473d3b632 100644 --- a/build_files/build_environment/patches/blosc.diff +++ b/build_files/build_environment/patches/blosc.diff @@ -10,24 +10,22 @@ diff -Naur src/blosc/CMakeLists.txt external_blosc/blosc/CMakeLists.txt endif(NOT Threads_FOUND) else(WIN32) find_package(Threads REQUIRED) -diff -Naur src/blosc/blosc.c external_blosc/blosc/blosc.c ---- src/blosc/blosc.c 2016-02-03 10:26:28 -0700 -+++ external_blosc/blosc/blosc.c 2017-03-03 09:01:50 -0700 -@@ -49,12 +49,12 @@ +diff -Naur external_blosc.orig/blosc/blosc.c external_blosc/blosc/blosc.c +--- external_blosc.orig/blosc/blosc.c 2018-07-30 04:56:38 -0600 ++++ external_blosc/blosc/blosc.c 2018-08-11 15:27:26 -0600 +@@ -56,14 +56,7 @@ #include <inttypes.h> #endif /* _WIN32 */ - --#if defined(_WIN32) && !defined(__GNUC__) + +-/* Include the win32/pthread.h library for all the Windows builds. See #224. */ +-#if defined(_WIN32) - #include "win32/pthread.h" - #include "win32/pthread.c" -#else -+//#if defined(_WIN32) && !defined(__GNUC__) -+// #include "win32/pthread.h" -+ //#include "win32/pthread.c" -+//#else - #include <pthread.h> +- #include <pthread.h> -#endif -+//#endif - - /* If C11 is supported, use it's built-in aligned allocation. */ - #if __STDC_VERSION__ >= 201112L +- ++#include <pthread.h> + + /* Some useful units */ + #define KB 1024 |