diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-16 07:11:27 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-16 07:15:18 +0300 |
commit | 813e470eac309a78d1f8cdc4a3abb0314b0ee5f3 (patch) | |
tree | 65bfb0ea60eb6f595b38fedcf33eb0a59f072cb0 /source/blender/editors | |
parent | bb6b7dd4adebcdacfeabdaf26daa5e0d49079f67 (diff) |
CMake: cleanup, arg rename, add definitions last
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/physics/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 4 | ||||
-rw-r--r-- | source/blender/editors/sound/CMakeLists.txt | 3 | ||||
-rw-r--r-- | source/blender/editors/space_graph/CMakeLists.txt | 3 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt index 1b42c3f2669..25b76f549a2 100644 --- a/source/blender/editors/physics/CMakeLists.txt +++ b/source/blender/editors/physics/CMakeLists.txt @@ -25,7 +25,6 @@ set(INC ../../makesdna ../../makesrna ../../windowmanager - ../../../../intern/elbeem/extern ../../../../intern/guardedalloc ../../../../intern/glew-mx ) @@ -55,6 +54,9 @@ set(LIB ) if(WITH_MOD_FLUID) + list(APPEND INC + ../../../../intern/elbeem/extern + ) add_definitions(-DWITH_MOD_FLUID) endif() diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 9192d1c2fe9..d3b57a09a9e 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -45,8 +45,6 @@ #include "DEG_depsgraph.h" -#include "LBM_fluidsim.h" - #include "ED_screen.h" #include "WM_types.h" @@ -57,6 +55,8 @@ /* enable/disable overall compilation */ #ifdef WITH_MOD_FLUID +#include "LBM_fluidsim.h" + #include "BLI_blenlib.h" #include "BLI_path_util.h" #include "BLI_math.h" diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index 41650f07101..a7d128a261d 100644 --- a/source/blender/editors/sound/CMakeLists.txt +++ b/source/blender/editors/sound/CMakeLists.txt @@ -39,11 +39,10 @@ set(LIB ) if(WITH_AUDASPACE) - add_definitions(-DWITH_AUDASPACE) - list(APPEND INC_SYS ${AUDASPACE_C_INCLUDE_DIRS} ) + add_definitions(-DWITH_AUDASPACE) endif() if(WITH_CODEC_FFMPEG) diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index 53c228cd9c9..391d0dff0f5 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -49,11 +49,10 @@ set(LIB ) if(WITH_AUDASPACE) - add_definitions(-DWITH_AUDASPACE) - list(APPEND INC_SYS ${AUDASPACE_C_INCLUDE_DIRS} ) + add_definitions(-DWITH_AUDASPACE) endif() if(WITH_INTERNATIONAL) |