[Bf-blender-cvs] [52c9d33cc29] soc-2019-openxr: Merge branch 'master' into soc-2019-openxr

[Julian Eisel]

Commit: 52c9d33cc29b6daca848a51f1d532af17c7c1301
Author: Julian Eisel
Date:   Mon Oct 14 16:05:46 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rB52c9d33cc29b6daca848a51f1d532af17c7c1301

Merge branch 'master' into soc-2019-openxr

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



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

diff --cc build_files/cmake/platform/platform_unix.cmake
index 09a2c30524b,c48780ebd6a..13fff9bd8c8
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@@ -432,15 -427,21 +427,30 @@@ if(WITH_OPENSUBDIV
    endif()
  endif()
  
+ if(WITH_TBB)
+   find_package_wrapper(TBB)
+ endif()
+ 
+ if(NOT WITH_TBB OR NOT TBB_FOUND)
+   if(WITH_OPENIMAGEDENOISE)
+     message(STATUS "TBB not found, disabling OpenImageDenoise")
+     set(WITH_OPENIMAGEDENOISE OFF)
+   endif()
+   if(WITH_OPENVDB)
+     message(STATUS "TBB not found, disabling OpenVDB")
+     set(WITH_OPENVDB OFF)
+   endif()
+ endif()
+ 
 +if(WITH_OPENXR)
 +  find_package(OpenXR-SDK)
 +  if(NOT OPENXR_SDK_FOUND)
 +    message(WARNING "OpenXR-SDK not found, disabling WITH_OPENXR")
 +    set(WITH_OPENXR OFF)
 +  endif()
 +endif()
 +
 +
  # OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
  if(HAIKU)
    list(APPEND PLATFORM_LINKLIBS -lnetwork)
diff --cc source/blender/blenkernel/CMakeLists.txt
index 32d91b8fa77,ec4246f5dba..0cf5aab6bc4
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -637,10 -638,14 +638,18 @@@ if(WITH_QUADRIFLOW
    add_definitions(-DWITH_QUADRIFLOW)
  endif()
  
+ if(WITH_TBB)
+   add_definitions(-DWITH_TBB)
+ 
+   list(APPEND INC_SYS
+     ${TBB_INCLUDE_DIRS}
+   )
+ endif()
+ 
 +if(WITH_OPENXR)
 +  add_definitions(-DWITH_OPENXR)
 +endif()
 +
  ## Warnings as errors, this is too strict!
  #if(MSVC)
  #   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")