[Bf-blender-cvs] [6472b98] master: Link windows builds against Blosc when OpenVDB is enabled

[Sergey Sharybin]

Commit: 6472b98a9c28eeeffabe4097a3a2aa59a41daeaf
Author: Sergey Sharybin
Date:   Wed Feb 24 15:50:08 2016 +0100
Branches: master
https://developer.blender.org/rB6472b98a9c28eeeffabe4097a3a2aa59a41daeaf

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.

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 891539e..28c962e 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()