From 813e470eac309a78d1f8cdc4a3abb0314b0ee5f3 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 16 Apr 2019 06:11:27 +0200
Subject: [PATCH] CMake: cleanup, arg rename, add definitions last

---
 build_files/cmake/macros.cmake                    | 14 +++++++-------
 extern/ceres/CMakeLists.txt                       |  6 +++++-
 extern/ceres/bundle.sh                            | 10 +++++-----
 intern/cycles/bvh/CMakeLists.txt                  |  6 +++++-
 intern/cycles/cmake/macros.cmake                  |  7 ++++++-
 intern/cycles/device/CMakeLists.txt               |  6 +++++-
 intern/cycles/graph/CMakeLists.txt                |  6 +++++-
 intern/cycles/kernel/CMakeLists.txt               |  6 +++++-
 intern/cycles/kernel/osl/CMakeLists.txt           |  6 +++++-
 intern/cycles/render/CMakeLists.txt               |  5 ++++-
 intern/cycles/subd/CMakeLists.txt                 |  6 +++++-
 intern/cycles/util/CMakeLists.txt                 |  6 +++++-
 intern/libmv/CMakeLists.txt                       |  6 +++++-
 intern/libmv/bundle.sh                            | 10 +++++-----
 source/blender/blenkernel/CMakeLists.txt          |  8 +++++---
 source/blender/blenkernel/intern/smoke.c          |  4 ++--
 source/blender/bmesh/CMakeLists.txt               |  2 +-
 source/blender/editors/physics/CMakeLists.txt     |  4 +++-
 source/blender/editors/physics/physics_fluid.c    |  4 ++--
 source/blender/editors/sound/CMakeLists.txt       |  3 +--
 source/blender/editors/space_graph/CMakeLists.txt |  3 +--
 source/blender/ikplugin/CMakeLists.txt            |  4 ++--
 source/blender/imbuf/CMakeLists.txt               |  1 -
 source/blender/modifiers/CMakeLists.txt           |  2 +-
 source/creator/CMakeLists.txt                     | 14 ++++++++------
 25 files changed, 98 insertions(+), 51 deletions(-)

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index c0340427d95..0da4a4a1bf9 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -222,7 +222,7 @@ function(blender_add_lib__impl
 	sources
 	includes
 	includes_sys
-	libraries
+	library_deps
 	)
 
 	# message(STATUS "Configuring library ${name}")
@@ -236,8 +236,8 @@ function(blender_add_lib__impl
 
 	# Use for testing 'BLENDER_SORTED_LIBS' removal.
 	if(DEFINED WITHOUT_SORTED_LIBS AND WITHOUT_SORTED_LIBS)
-		if (NOT "${libraries}" STREQUAL "")
-			target_link_libraries(${name} "${libraries}")
+		if (NOT "${library_deps}" STREQUAL "")
+			target_link_libraries(${name} "${library_deps}")
 		endif()
 	endif()
 
@@ -265,12 +265,12 @@ function(blender_add_lib_nolist
 	sources
 	includes
 	includes_sys
-	libraries
+	library_deps
 	)
 
 	add_cc_flags_custom_test(${name} PARENT_SCOPE)
 
-	blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${libraries}")
+	blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${library_deps}")
 endfunction()
 
 function(blender_add_lib
@@ -278,12 +278,12 @@ function(blender_add_lib
 	sources
 	includes
 	includes_sys
-	libraries
+	library_deps
 	)
 
 	add_cc_flags_custom_test(${name} PARENT_SCOPE)
 
-	blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${libraries}")
+	blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${library_deps}")
 
 	set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
 endfunction()
diff --git a/extern/ceres/CMakeLists.txt b/extern/ceres/CMakeLists.txt
index 0531eb71ba5..fad0734f52f 100644
--- a/extern/ceres/CMakeLists.txt
+++ b/extern/ceres/CMakeLists.txt
@@ -256,6 +256,10 @@ set(SRC
 	internal/ceres/wall_time.h
 )
 
+set(LIB
+
+)
+
 if(WITH_LIBMV_SCHUR_SPECIALIZATIONS)
 	list(APPEND SRC
 		internal/ceres/generated/partitioned_matrix_view_2_2_2.cc
@@ -319,4 +323,4 @@ if(WITH_OPENMP)
 	)
 endif()
 
-blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}" "")
+blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/extern/ceres/bundle.sh b/extern/ceres/bundle.sh
index e8212aa1d41..b084eb4a00c 100755
--- a/extern/ceres/bundle.sh
+++ b/extern/ceres/bundle.sh
@@ -109,10 +109,6 @@ cat > CMakeLists.txt << EOF
 #
 # The Original Code is Copyright (C) 2012, Blender Foundation
 # All rights reserved.
-#
-# Contributor(s): Blender Foundation,
-#                 Sergey Sharybin
-#
 # ***** END GPL LICENSE BLOCK *****
 
 # NOTE: This file is automatically generated by bundle.sh script
@@ -139,6 +135,10 @@ ${sources}
 ${headers}
 )
 
+set(LIB
+
+)
+
 if(WITH_LIBMV_SCHUR_SPECIALIZATIONS)
 	list(APPEND SRC
 ${generated_sources}
@@ -165,5 +165,5 @@ if(WITH_OPENMP)
 	)
 endif()
 
-blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}" "")
+blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}" "\${LIB}")
 EOF
diff --git a/intern/cycles/bvh/CMakeLists.txt b/intern/cycles/bvh/CMakeLists.txt
index 6014624f395..52f4138432b 100644
--- a/intern/cycles/bvh/CMakeLists.txt
+++ b/intern/cycles/bvh/CMakeLists.txt
@@ -35,7 +35,11 @@ set(SRC_HEADERS
 	bvh_unaligned.h
 )
 
+set(LIB
+
+)
+
 include_directories(${INC})
 include_directories(SYSTEM ${INC_SYS})
 
-cycles_add_library(cycles_bvh ${SRC} ${SRC_HEADERS})
+cycles_add_library(cycles_bvh "${LIB}" ${SRC} ${SRC_HEADERS})
diff --git a/intern/cycles/cmake/macros.cmake b/intern/cycles/cmake/macros.cmake
index f3ca06ac6b8..ed4c0e48c03 100644
--- a/intern/cycles/cmake/macros.cmake
+++ b/intern/cycles/cmake/macros.cmake
@@ -6,7 +6,12 @@ function(cycles_set_solution_folder target)
 	endif()
 endfunction()
 
-macro(cycles_add_library target)
+macro(cycles_add_library target library_deps)
 	add_library(${target} ${ARGN})
+	if(DEFINED WITHOUT_SORTED_LIBS AND WITHOUT_SORTED_LIBS)
+		if(NOT ("${library_deps}" STREQUAL ""))
+			target_link_libraries(${target} "${library_deps}")
+		endif()
+	endif()
 	cycles_set_solution_folder(${target})
 endmacro()
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt
index d95cd02a85e..f0f0390c29b 100644
--- a/intern/cycles/device/CMakeLists.txt
+++ b/intern/cycles/device/CMakeLists.txt
@@ -58,6 +58,10 @@ set(SRC_HEADERS
 	device_task.h
 )
 
+set(LIB
+
+)
+
 add_definitions(${GL_DEFINITIONS})
 if(WITH_CYCLES_NETWORK)
 	add_definitions(-DWITH_NETWORK)
@@ -75,4 +79,4 @@ endif()
 include_directories(${INC})
 include_directories(SYSTEM ${INC_SYS})
 
-cycles_add_library(cycles_device ${SRC} ${SRC_OPENCL} ${SRC_HEADERS})
+cycles_add_library(cycles_device "${LIB}" ${SRC} ${SRC_OPENCL} ${SRC_HEADERS})
diff --git a/intern/cycles/graph/CMakeLists.txt b/intern/cycles/graph/CMakeLists.txt
index 0ce56c2b2e6..bd2b2728a29 100644
--- a/intern/cycles/graph/CMakeLists.txt
+++ b/intern/cycles/graph/CMakeLists.txt
@@ -16,7 +16,11 @@ set(SRC_HEADERS
 	node_xml.h
 )
 
+set(LIB
+
+)
+
 include_directories(${INC})
 include_directories(SYSTEM ${INC_SYS})
 
-cycles_add_library(cycles_graph ${SRC} ${SRC_HEADERS})
+cycles_add_library(cycles_graph "${LIB}" ${SRC} ${SRC_HEADERS})
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index 822ce68bdc8..cbb69962781 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -333,6 +333,10 @@ set(SRC_SPLIT_HEADERS
 	split/kernel_subsurface_scatter.h
 )
 
+set(LIB
+
+)
+
 # CUDA module
 
 if(WITH_CYCLES_CUDA_BINARIES)
@@ -507,7 +511,7 @@ if(CXX_HAS_AVX2)
 	set_source_files_properties(kernels/cpu/filter_avx2.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX2_KERNEL_FLAGS}")
 endif()
 
-cycles_add_library(cycles_kernel
+cycles_add_library(cycles_kernel "${LIB}"
 	${SRC_CPU_KERNELS}
 	${SRC_CUDA_KERNELS}
 	${SRC_OPENCL_KERNELS}
diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt
index adca45c5c76..804610bdc10 100644
--- a/intern/cycles/kernel/osl/CMakeLists.txt
+++ b/intern/cycles/kernel/osl/CMakeLists.txt
@@ -25,9 +25,13 @@ set(HEADER_SRC
 	osl_shader.h
 )
 
+set(LIB
+
+)
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
 
 include_directories(${INC})
 include_directories(SYSTEM ${INC_SYS})
 
-cycles_add_library(cycles_kernel_osl ${SRC} ${HEADER_SRC})
+cycles_add_library(cycles_kernel_osl "${LIB}" ${SRC} ${HEADER_SRC})
diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt
index b7c53f17c3d..af0f8b806a8 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -73,6 +73,9 @@ set(SRC_HEADERS
 	tile.h
 )
 
+set(LIB
+)
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
 
 include_directories(${INC})
@@ -80,4 +83,4 @@ include_directories(SYSTEM ${INC_SYS})
 
 add_definitions(${GL_DEFINITIONS})
 
-cycles_add_library(cycles_render ${SRC} ${SRC_HEADERS})
+cycles_add_library(cycles_render "${LIB}" ${SRC} ${SRC_HEADERS})
diff --git a/intern/cycles/subd/CMakeLists.txt b/intern/cycles/subd/CMakeLists.txt
index 7f952dd43ce..9669bdede7e 100644
--- a/intern/cycles/subd/CMakeLists.txt
+++ b/intern/cycles/subd/CMakeLists.txt
@@ -21,7 +21,11 @@ set(SRC_HEADERS
 	subd_split.h
 )
 
+set(LIB
+
+)
+
 include_directories(${INC})
 include_directories(SYSTEM ${INC_SYS})
 
-cycles_add_library(cycles_subd ${SRC} ${SRC_HEADERS})
+cycles_add_library(cycles_subd "${LIB}" ${SRC} ${SRC_HEADERS})
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt
index 16abed142b2..b8b38a531ea 100644
--- a/intern/cycles/util/CMakeLists.txt
+++ b/intern/cycles/util/CMakeLists.txt
@@ -27,6 +27,10 @@ set(SRC
 	util_transform.cpp
 )
 
+set(LIB
+
+)
+
 if(WITH_CYCLES_STANDALONE)
 	if (WITH_CYCLES_STANDALONE_GUI)
 		list(APPEND SRC
@@ -146,4 +150,4 @@ include_directories(SYSTEM ${INC_SYS})
 
 add_definitions(${GL_DEFINITIONS})
 
-cycles_add_library(cycles_util ${SRC} ${SRC_HEADERS})
+cycles_add_library(cycles_util "${LIB}" ${SRC} ${SRC_HEADERS})
diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt
index 5adfdbea1af..91e638c9c45 100644
--- a/intern/libmv/CMakeLists.txt
+++ b/intern/libmv/CMakeLists.txt
@@ -33,6 +33,10 @@ set(SRC
 	libmv-capi.h
 )
 
+set(LIB
+
+)
+
 if(WITH_LIBMV)
 	add_definitions(${GFLAGS_DEFINES})
 	add_definitions(${GLOG_DEFINES})
@@ -232,4 +236,4 @@ else()
 	)
 endif()
 
-blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}" "")
+blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/intern/libmv/bundle.sh b/intern/libmv/bundle.sh
index 98a1e364634..27fc0e886a1 100755
--- a/intern/libmv/bundle.sh
+++ b/intern/libmv/bundle.sh
@@ -95,10 +95,6 @@ cat > CMakeLists.txt << EOF
 #
 # The Original Code is Copyright (C) 2011, Blender Foundation
 # All rights reserved.
-#
-# Contributor(s): Blender Foundation,
-#                 Sergey Sharybin
-#
 # ***** END GPL LICENSE BLOCK *****
 
 # NOTE: This file is automatically generated by bundle.sh script
@@ -116,6 +112,10 @@ set(SRC
 	libmv-capi.h
 )
 
+set(LIB
+
+)
+
 if(WITH_LIBMV)
 	add_definitions(\${GFLAGS_DEFINES})
 	add_definitions(\${GLOG_DEFINES})
@@ -184,5 +184,5 @@ else()
 	)
 endif()
 
-blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}" "")
+blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}" "\${LIB}")
 EOF
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