From 813e470eac309a78d1f8cdc4a3abb0314b0ee5f3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 16 Apr 2019 06:11:27 +0200 Subject: CMake: cleanup, arg rename, add definitions last --- source/blender/blenkernel/CMakeLists.txt | 8 +++++--- source/blender/blenkernel/intern/smoke.c | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 8e6a912b071..390ac51e470 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -44,7 +44,6 @@ set(INC ../../../intern/iksolver/extern ../../../intern/memutil ../../../intern/mikktspace - ../../../intern/smoke/extern ../../../intern/atomic ../../../intern/clog ../../../intern/libmv @@ -486,6 +485,9 @@ if(WITH_MOD_FLUID) endif() if(WITH_MOD_SMOKE) + list(APPEND INC + ../../../intern/smoke/extern + ) add_definitions(-DWITH_SMOKE) endif() @@ -545,17 +547,17 @@ if(WITH_ALEMBIC) endif() if(WITH_OPENSUBDIV) - add_definitions(-DWITH_OPENSUBDIV) list(APPEND INC_SYS ${OPENSUBDIV_INCLUDE_DIRS} ) + add_definitions(-DWITH_OPENSUBDIV) endif() if(WITH_OPENVDB) - add_definitions(-DWITH_OPENVDB) list(APPEND INC ../../../intern/openvdb ) + add_definitions(-DWITH_OPENVDB) if(WITH_OPENVDB_BLOSC) add_definitions( diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 82acc272c6b..122bb5a19c5 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -87,10 +87,10 @@ # include "PIL_time.h" #endif -#include "smoke_API.h" - #ifdef WITH_SMOKE +#include "smoke_API.h" + #include "BLI_task.h" #include "BLI_kdtree.h" #include "BLI_voxel.h" -- cgit v1.2.3