diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31fe13c8a17..3164e7db621 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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(