Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: remove WITH_EMBREE make deps option

Browse Source 
No other default enabled libraries have an option either.
This commit is contained in:
Brecht Van Lommel
2020-02-15 17:14:41 +01:00
parent b5f17f6b8a
commit 50975026ff
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build_files/build_environment/CMakeLists.txt
View File

@@ -98,15 +98,12 @@ else()
include(cmake/pugixml.cmake) include(cmake/pugixml.cmake)
endif() endif()
include(cmake/openimagedenoise.cmake) include(cmake/openimagedenoise.cmake)
include(cmake/embree.cmake)
if(WITH_WEBP) if(WITH_WEBP)
include(cmake/webp.cmake) include(cmake/webp.cmake)
endif() endif()
if(WITH_EMBREE)
include(cmake/embree.cmake)
endif()
if(WIN32) if(WIN32)
# HMD branch deps # HMD branch deps
include(cmake/hidapi.cmake) include(cmake/hidapi.cmake)

1
build_files/build_environment/cmake/options.cmake
View File

@@ -20,7 +20,6 @@ if(WIN32)
option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/lapack/fftw3 by installing mingw64" ON) option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/lapack/fftw3 by installing mingw64" ON)
endif() endif()
option(WITH_WEBP "Enable building of oiio with webp support" OFF) 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") set(MAKE_THREADS 1 CACHE STRING "Number of threads to run make with")
if(NOT BUILD_MODE) if(NOT BUILD_MODE)