diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2021-11-23 15:23:50 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-11-23 15:23:50 +0300 |
| commit | d944b969f0227c01df08dab8c9527e72919776a1 (patch) | |
| tree | 70dd1810b129fd3e15a99129251d0be07542482b /CMakeLists.txt | |
| parent | 8e437578342193832d8f66f9d8c81d6be723e927 (diff) | |
| parent | cf299bee8089e1dc0ee35a89b831532073588f7b (diff) | |
Merge branch 'master' into temp-ghost-vulkan-backend
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6527c82c0fc..349bc884111 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -411,6 +411,7 @@ option(WITH_CYCLES "Enable Cycles Render Engine" ON) option(WITH_CYCLES_OSL "Build Cycles with OpenShadingLanguage support" ON) option(WITH_CYCLES_EMBREE "Build Cycles with Embree support" ON) option(WITH_CYCLES_LOGGING "Build Cycles with logging support" ON) +option(WITH_CYCLES_DEBUG "Build Cycles with options useful for debugging (e.g., MIS)" OFF) option(WITH_CYCLES_STANDALONE "Build Cycles standalone application" OFF) option(WITH_CYCLES_STANDALONE_GUI "Build Cycles standalone with GUI" OFF) @@ -1073,7 +1074,7 @@ if(MSVC) add_definitions(-D__LITTLE_ENDIAN__) # OSX-Note: as we do cross-compiling with specific set architecture, - # endianess-detection and auto-setting is counterproductive + # endianness-detection and auto-setting is counterproductive # so we just set endianness according CMAKE_OSX_ARCHITECTURES elseif(CMAKE_OSX_ARCHITECTURES MATCHES i386 OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64 OR CMAKE_OSX_ARCHITECTURES MATCHES arm64) @@ -1772,7 +1773,7 @@ endif() set(CMAKE_CXX_STANDARD 17) # If C++17 is not available, downgrading to an earlier standard is NOT OK. set(CMAKE_CXX_STANDARD_REQUIRED ON) -# Do not enable compiler specific language extentions. +# Do not enable compiler specific language extensions. set(CMAKE_CXX_EXTENSIONS OFF) # Make MSVC properly report the value of the __cplusplus preprocessor macro |