bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Build: Disable WITH_MOD_OCEANSIM when WITH_FFTW3 is disabled

Browse Source 
Bring behavior in line with other options.

Pull Request: https://projects.blender.org/blender/blender/pulls/122865
This commit is contained in:
Zopolis4 2024-06-12 16:36:50 +02:00 committed by Brecht Van Lommel
parent 6a9feebf07
commit 0a74065a19
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -1230,6 +1230,9 @@ set_and_warn_dependency(WITH_IMAGE_OPENEXR WITH_CYCLES_OSL OFF)
# Hydra requires USD.
set_and_warn_dependency(WITH_USD WITH_HYDRA OFF)
# The Ocean modifier requires FFTW3.
set_and_warn_dependency(WITH_FFTW3 WITH_MOD_OCEANSIM OFF)
if(NOT WITH_CYCLES)
set(WITH_CYCLES_OSL OFF)
endif()
@ -1433,10 +1436,6 @@ endif()
# -----------------------------------------------------------------------------
# Common Checks for Compatible Options
if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON")
endif()
if(WITH_INTERNATIONAL)
if(NOT WITH_BOOST)
message(