From fc81eb74e7f9bdce239d745bfbc0cbf581eb075d Mon Sep 17 00:00:00 2001
From: Julian Eisel <eiseljulian@gmail.com>
Date: Mon, 24 Feb 2020 12:30:56 +0100
Subject: Mantaflow: Address precompiler warning and related cleanup

* Address warning because of undefined OPENVDB usage
* Remove unused WITH_FLUID definitions

Differential Revision: https://developer.blender.org/D6919
---
 intern/mantaflow/CMakeLists.txt                    | 2 ++
 source/blender/editors/space_view3d/CMakeLists.txt | 4 ----
 source/blender/render/CMakeLists.txt               | 4 ----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/intern/mantaflow/CMakeLists.txt b/intern/mantaflow/CMakeLists.txt
index b2a0ab30a0c..d9b64b3a199 100644
--- a/intern/mantaflow/CMakeLists.txt
+++ b/intern/mantaflow/CMakeLists.txt
@@ -28,6 +28,8 @@ add_definitions(-DWITH_FLUID=1)
 if(WITH_OPENVDB)
   add_definitions(-DOPENVDB=1)
   add_definitions(-DOPENVDB_STATICLIB)
+else()
+  add_definitions(-DOPENVDB=0)
 endif()
 
 if(WIN32)
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index 9e3c9d6725d..91694cfc1ef 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -94,10 +94,6 @@ if(WITH_FREESTYLE)
   add_definitions(-DWITH_FREESTYLE)
 endif()
 
-if(WITH_MOD_FLUID)
-  add_definitions(-DWITH_FLUID)
-endif()
-
 blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
 # Needed so we can use dna_type_offsets.h for defaults initialization.
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index a92be8509d5..a1dd9b3d5b0 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -86,10 +86,6 @@ if(WITH_IMAGE_OPENEXR)
   add_definitions(-DWITH_OPENEXR)
 endif()
 
-if(WITH_MOD_FLUID)
-  add_definitions(-DWITH_FLUID)
-endif()
-
 if(WITH_FREESTYLE)
   list(APPEND INC
     ../freestyle
-- 
cgit v1.2.3