CMake: cleanup, arg rename, add definitions last

11 files changed, 26 insertions, 23 deletions

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"
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt
index be6c819bc1f..6e228bba3ee 100644
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -171,10 +171,10 @@ if(MSVC AND NOT MSVC_CLANG)
 endif()
 
 if(WITH_BULLET)
-	add_definitions(-DWITH_BULLET)
 	list(APPEND INC_SYS
 		${BULLET_INCLUDE_DIRS}
 	)
+	add_definitions(-DWITH_BULLET)
 endif()
 
 if(WITH_INTERNATIONAL)
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)
diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt
index 9bbc3a62b99..e741bf92925 100644
--- a/source/blender/ikplugin/CMakeLists.txt
+++ b/source/blender/ikplugin/CMakeLists.txt
@@ -43,7 +43,6 @@ set(LIB
 )
 
 if(WITH_IK_SOLVER)
-	add_definitions(-DWITH_IK_SOLVER)
 	list(APPEND INC
 		../../../intern/iksolver/extern
 	)
@@ -51,10 +50,10 @@ if(WITH_IK_SOLVER)
 		intern/iksolver_plugin.c
 		intern/iksolver_plugin.h
 	)
+	add_definitions(-DWITH_IK_SOLVER)
 endif()
 
 if(WITH_IK_ITASC)
-	add_definitions(-DWITH_IK_ITASC)
 	list(APPEND INC
 		../../../intern/itasc
 	)
@@ -65,6 +64,7 @@ if(WITH_IK_ITASC)
 		intern/itasc_plugin.cpp
 		intern/itasc_plugin.h
 	)
+	add_definitions(-DWITH_IK_ITASC)
 endif()
 
 blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index 87002e5efc0..5c16e0d162a 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -101,7 +101,6 @@ if(WITH_IMAGE_TIFF)
 	list(APPEND SRC
 		intern/tiff.c
 	)
-
 	add_definitions(-DWITH_TIFF)
 endif()
 
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 4873e08bb05..8cf6382608d 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -119,10 +119,10 @@ if(WITH_ALEMBIC)
 endif()
 
 if(WITH_MOD_REMESH)
-	add_definitions(-DWITH_MOD_REMESH)
 	list(APPEND INC
 		../../../intern/dualcon
 	)
+	add_definitions(-DWITH_MOD_REMESH)
 endif()
 
 if(WITH_MOD_FLUID)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 1455560d138..5111e2b5491 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -52,9 +52,11 @@ if(WITH_LIBMV)
 	add_definitions(-DWITH_LIBMV)
 endif()
 
-if(WITH_CYCLES AND WITH_CYCLES_LOGGING)
-	blender_include_dirs(../../intern/cycles/blender)
-	add_definitions(-DWITH_CYCLES_LOGGING)
+if(WITH_CYCLES)
+	if(WITH_CYCLES_LOGGING)
+		blender_include_dirs(../../intern/cycles/blender)
+		add_definitions(-DWITH_CYCLES_LOGGING)
+	endif()
 endif()
 
 if(WITH_CODEC_FFMPEG)
@@ -76,20 +78,20 @@ endif()
 
 if(WITH_SDL)
 	if(WITH_SDL_DYNLOAD)
-		add_definitions(-DWITH_SDL_DYNLOAD)
 		blender_include_dirs(../../extern/sdlew/include)
+		add_definitions(-DWITH_SDL_DYNLOAD)
 	endif()
 	add_definitions(-DWITH_SDL)
 endif()
 
 if(WITH_BINRELOC)
-	add_definitions(-DWITH_BINRELOC)
 	blender_include_dirs(${BINRELOC_INCLUDE_DIRS})
+	add_definitions(-DWITH_BINRELOC)
 endif()
 
 if(WITH_FREESTYLE)
-	add_definitions(-DWITH_FREESTYLE)
 	blender_include_dirs(../blender/freestyle)
+	add_definitions(-DWITH_FREESTYLE)
 endif()
 
 # Setup the exe sources and buildinfo