[Bf-blender-cvs] [aaa43e2] openvdb: Fix for missing boost dependency when OpenVDB is disabled.

[Lukas Tönne]

Commit: aaa43e2b84a0a531929916fcb77c3fab18bacd29
Author: Lukas Tönne
Date:   Fri Jun 12 10:23:29 2015 +0200
Branches: openvdb
https://developer.blender.org/rBaaa43e2b84a0a531929916fcb77c3fab18bacd29

Fix for missing boost dependency when OpenVDB is disabled.

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f0d7d3..c8d3529 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -983,6 +983,24 @@ if(UNIX AND NOT APPLE)
 		endif()
 	endif()
 
+	if(WITH_OPENVDB)
+		find_package_wrapper(OpenVDB)
+
+		set(TBB ${LIBDIR}/tbb)
+		set(TBB_LIBRARIES tbb)
+		set(TBB_LIBPATH ${TBB}/lib)
+
+		set(OPENVDB_LIBRARIES ${OPENVDB_LIBRARIES} ${BOOST_LIBRARIES} ${ZLIB_LIBRARIES} ${TBB_LIBRARIES})
+		set(OPENVDB_LIBPATH)  # TODO, remove and reference the absolute path everywhere
+		set(OPENVDB_DEFINITIONS)
+
+		if(NOT OPENVDB_FOUND)
+			set(WITH_OPENVDB OFF)
+			set(WITH_OPENVDB_BLOSC OFF)
+			message(STATUS "OpenVDB not found")
+		endif()
+	endif()
+
 	if(WITH_BOOST)
 		# uses in build instructions to override include and library variables
 		if(NOT BOOST_CUSTOM)
@@ -1066,24 +1084,6 @@ if(UNIX AND NOT APPLE)
 		endif()
 	endif()
 
-	if(WITH_OPENVDB)
-		find_package_wrapper(OpenVDB)
-
-		set(TBB ${LIBDIR}/tbb)
-		set(TBB_LIBRARIES tbb)
-		set(TBB_LIBPATH ${TBB}/lib)
-
-		set(OPENVDB_LIBRARIES ${OPENVDB_LIBRARIES} ${BOOST_LIBRARIES} ${ZLIB_LIBRARIES} ${TBB_LIBRARIES})
-		set(OPENVDB_LIBPATH)  # TODO, remove and reference the absolute path everywhere
-		set(OPENVDB_DEFINITIONS)
-
-		if(NOT OPENVDB_FOUND)
-			set(WITH_OPENVDB OFF)
-			set(WITH_OPENVDB_BLOSC OFF)
-			message(STATUS "OpenVDB not found")
-		endif()
-	endif()
-
 	if(WITH_LLVM)
         find_package_wrapper(LLVM)