Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-24 17:50:08 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-24 17:51:26 +0300
commit6472b98a9c28eeeffabe4097a3a2aa59a41daeaf (patch)
tree5159614abc799d1803742dc008d8e7c0ee84bad6 /CMakeLists.txt
parent43d4d72e05b94097154602e33f0ad1e785a95fc4 (diff)
Link windows builds against Blosc when OpenVDB is enabled
OpenVDB is compiled with Blosc support, meaning we should pass Blosc to a linker now. Unfortunately, the Blosc has compiled-in crt and pthread library, which still screws up linking.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 891539e0b34..28c962e0d55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1576,11 +1576,12 @@ elseif(WIN32)
endif()
if(WITH_OPENVDB)
+ set(BLOSC_LIBRARIES ${LIBDIR}/blosc/lib/libblosc.lib)
set(TBB_LIBRARIES ${LIBDIR}/tbb/lib/tbb.lib)
set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
set(OPENVDB ${LIBDIR}/openvdb)
set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include ${TBB_INCLUDE_DIR})
- set(OPENVDB_LIBRARIES openvdb ${TBB_LIBRARIES})
+ set(OPENVDB_LIBRARIES openvdb ${TBB_LIBRARIES} ${BLOSC_LIBRARIES})
set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib)
endif()