diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-15 19:14:41 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-15 22:31:18 +0300 |
commit | 50975026ff845c8c4cd411635cf4d22d0ea6ddaa (patch) | |
tree | 35eec182e66cafdeeb95cb7361b63ff1f436e860 /build_files/build_environment | |
parent | b5f17f6b8a058185cf1c85b308557e5cf9d7a573 (diff) |
Cleanup: remove WITH_EMBREE make deps option
No other default enabled libraries have an option either.
Diffstat (limited to 'build_files/build_environment')
-rw-r--r-- | build_files/build_environment/CMakeLists.txt | 5 | ||||
-rw-r--r-- | build_files/build_environment/cmake/options.cmake | 1 |
2 files changed, 1 insertions, 5 deletions
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) |