diff options
| author | Werner, Stefan <stefan.werner@intel.com> | 2022-04-26 16:34:42 +0300 |
|---|---|---|
| committer | Werner, Stefan <stefan.werner@intel.com> | 2022-04-26 16:34:42 +0300 |
| commit | 1252de028f3370d522e16dfa77a1f28f0f0b006b (patch) | |
| tree | e8a5613827fdfb80000d831a50cca22878257269 /CMakeLists.txt | |
| parent | 79e57452982670000763c034564a934d3dba8db3 (diff) | |
| parent | 96bdd65e740e669eceb18258dbc4b27d268d10aa (diff) | |
Merge branch 'master' into cycles_oneapi
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b9a9f85305e..59af96e9ca5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -284,7 +284,7 @@ option(WITH_IMAGE_TIFF "Enable LibTIFF Support" ON) option(WITH_IMAGE_DDS "Enable DDS Image Support" ON) option(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON) option(WITH_IMAGE_HDR "Enable HDR Image Support" ON) -option(WITH_IMAGE_WEBP "Enable WebP Image Support" OFF) +option(WITH_IMAGE_WEBP "Enable WebP Image Support" ON) # Audio/Video format support option(WITH_CODEC_AVI "Enable Blenders own AVI file support (raw/jpeg)" ON) @@ -302,7 +302,7 @@ option(WITH_USD "Enable Universal Scene Description (USD) Suppor option(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org)" ON) # Sound output -option(WITH_SDL "Enable SDL for sound and joystick support" ON) +option(WITH_SDL "Enable SDL for sound" ON) option(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON) if(APPLE) option(WITH_COREAUDIO "Enable CoreAudio for audio support on macOS" ON) @@ -439,12 +439,7 @@ endif() # AMD HIP if(NOT APPLE) - 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_DEVICE_HIP "Enable Cycles AMD HIP support" ON) 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) |