diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2021-11-23 16:01:01 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-11-23 16:01:01 +0300 |
| commit | fc502a8710d13016123f7df4d83e461c3d1e7e83 (patch) | |
| tree | abac56d4f0ba03ee63c9f84f401c8e20f9c3f904 /CMakeLists.txt | |
| parent | b65df10346f5fe47c881b183901e2d7eff775848 (diff) | |
| parent | d944b969f0227c01df08dab8c9527e72919776a1 (diff) | |
Merge branch 'temp-ghost-vulkan-backend' into tmp-vulkan
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a622e52143..5e4c0a2efa4 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) @@ -440,7 +441,11 @@ mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL) mark_as_advanced(WITH_CUDA_DYNLOAD) # AMD HIP -option(WITH_CYCLES_DEVICE_HIP "Enable Cycles AMD HIP support" OFF) +if(WIN32) + option(WITH_CYCLES_DEVICE_HIP "Enable Cycles AMD HIP support" ON) +else() + option(WITH_CYCLES_DEVICE_HIP "Enable Cycles AMD HIP support" OFF) +endif() option(WITH_CYCLES_HIP_BINARIES "Build Cycles AMD HIP binaries" OFF) set(CYCLES_HIP_BINARIES_ARCH gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 CACHE STRING "AMD HIP architectures to build binaries for") mark_as_advanced(WITH_CYCLES_DEVICE_HIP) @@ -1070,7 +1075,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 +1777,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 |