[Bf-blender-cvs] [eb844fc1da4] master: CMake: fix building without smoke enabled

Campbell Barton noreply at git.blender.org
Fri Apr 19 13:55:40 CEST 2019


Commit: eb844fc1da4b39aea3b9cd1c5091cdb56a81cae0
Author: Campbell Barton
Date:   Fri Apr 19 13:54:43 2019 +0200
Branches: master
https://developer.blender.org/rBeb844fc1da4b39aea3b9cd1c5091cdb56a81cae0

CMake: fix building without smoke enabled

Was removed when removing sorted libs however it's needed for stubs.

===================================================================

M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenkernel/intern/smoke.c

===================================================================

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index bc16c8b9a8e..cd612cd9d8c 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -49,6 +49,7 @@ set(INC
   ../../../intern/libmv
   ../../../intern/opensubdiv
   ../../../extern/curve_fit_nd
+  ../../../intern/smoke/extern
 )
 
 set(INC_SYS
@@ -521,9 +522,6 @@ if(WITH_MOD_FLUID)
 endif()
 
 if(WITH_MOD_SMOKE)
-  list(APPEND INC
-    ../../../intern/smoke/extern
-  )
   list(APPEND LIB
     bf_intern_smoke
   )
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index acb0fd350d2..5b720b1557a 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -82,14 +82,13 @@
 
 //#define DEBUG_TIME
 
+#include "smoke_API.h"
+
 #ifdef DEBUG_TIME
 #  include "PIL_time.h"
 #endif
 
 #ifdef WITH_SMOKE
-
-#  include "smoke_API.h"
-
 #  include "BLI_task.h"
 #  include "BLI_kdtree.h"
 #  include "BLI_voxel.h"



More information about the Bf-blender-cvs mailing list