Install_deps.sh: attempt to add OpenVDB, not working for now.
[blender.git] / CMakeLists.txt
index 59a13dee7f7330603a401c157e95c28dad1fb8b2..ae224f2a53d37051096c4825d9150097b3febaad 100644 (file)
@@ -184,7 +184,6 @@ if (UNIX AND NOT APPLE)
 elseif(WIN32)
        set(_init_JACK                           OFF)
 elseif(APPLE)
-       set(_init_INPUT_NDOF                     OFF)
        set(_init_JACK                           OFF)
        set(_init_OPENSUBDIV                     OFF)
 endif()
@@ -391,7 +390,7 @@ option(WITH_CYCLES_STANDALONE               "Build Cycles standalone application" OFF)
 option(WITH_CYCLES_STANDALONE_GUI      "Build Cycles standalone with GUI" OFF)
 option(WITH_CYCLES_OSL                         "Build Cycles with OSL support" ${_init_CYCLES_OSL})
 option(WITH_CYCLES_CUDA_BINARIES       "Build Cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 sm_52 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_37 sm_50 sm_52 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
 option(WITH_CYCLES_LOGGING     "Build Cycles with logging support" ON)
@@ -1064,19 +1063,11 @@ if(UNIX AND NOT APPLE)
 
        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)
+               find_package_wrapper(TBB)
+               if(NOT OPENVDB_FOUND OR NOT TBB_FOUND)
                        set(WITH_OPENVDB OFF)
                        set(WITH_OPENVDB_BLOSC OFF)
-                       message(STATUS "OpenVDB not found")
+                       message(STATUS "OpenVDB not found, disabling it")
                endif()
        endif()