diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-08-19 20:24:08 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-08-19 20:44:46 +0300 |
| commit | 8f4d772bf997e50346e20611f0ff9bd053308ceb (patch) | |
| tree | 4bd1ea2b1272ab70d36316122a50d35492a14418 /build_files | |
| parent | 4c22343271966752094b1e64af45fc5a5c6109b9 (diff) | |
build_environment: blosc build fixes.
blosc embedded a copy of zlib/pthreads causing duplicate symbol linker errors. pthreads was windows specific, but zlib may apply to other platforms as well.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/blosc.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/blosc.cmake b/build_files/build_environment/cmake/blosc.cmake index 02f98dfe1f3..e432096b93f 100644 --- a/build_files/build_environment/cmake/blosc.cmake +++ b/build_files/build_environment/cmake/blosc.cmake @@ -28,12 +28,20 @@ set(BLOSC_EXTRA_ARGS -DDEACTIVATE_SNAPPY=ON ) +if(WIN32) + #prevent blosc from including it's own local copy of zlib in the object file + #and cause linker errors with everybody else + set(BLOSC_EXTRA_ARGS ${BLOSC_EXTRA_ARGS} + -DPREFER_EXTERNAL_ZLIB=ON + ) +endif() + ExternalProject_Add(external_blosc URL ${BLOSC_URI} 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 ) |