[Bf-blender-cvs] [50975026ff8] master: Cleanup: remove WITH_EMBREE make deps option

[Brecht Van Lommel]

Commit: 50975026ff845c8c4cd411635cf4d22d0ea6ddaa
Author: Brecht Van Lommel
Date:   Sat Feb 15 17:14:41 2020 +0100
Branches: master
https://developer.blender.org/rB50975026ff845c8c4cd411635cf4d22d0ea6ddaa

Cleanup: remove WITH_EMBREE make deps option

No other default enabled libraries have an option either.

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

M	build_files/build_environment/CMakeLists.txt
M	build_files/build_environment/cmake/options.cmake

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

diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt
index 9a96446f201..34ad0599ce2 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -98,15 +98,12 @@ else()
   include(cmake/pugixml.cmake)
 endif()
 include(cmake/openimagedenoise.cmake)
+include(cmake/embree.cmake)
 
 if(WITH_WEBP)
   include(cmake/webp.cmake)
 endif()
 
-if(WITH_EMBREE)
-  include(cmake/embree.cmake)
-endif()
-
 if(WIN32)
   # HMD branch deps
   include(cmake/hidapi.cmake)
diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake
index 950209f545a..ed82f1fd9ee 100644
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -20,7 +20,6 @@ if(WIN32)
   option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/lapack/fftw3 by installing mingw64" ON)
 endif()
 option(WITH_WEBP "Enable building of oiio with webp support" OFF)
-option(WITH_EMBREE "Enable building of Embree" ON)
 set(MAKE_THREADS 1 CACHE STRING "Number of threads to run make with")
 
 if(NOT BUILD_MODE)