cmake option to build without iksolver

4 files changed, 28 insertions, 12 deletions

diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt
index f37b254d719..903267c5618 100644
--- a/source/blender/ikplugin/CMakeLists.txt
+++ b/source/blender/ikplugin/CMakeLists.txt
@@ -29,7 +29,6 @@ set(INC
 	../blenlib
 	../makesdna
 	../../../intern/guardedalloc
-	../../../intern/iksolver/extern
 )
 
 set(INC_SYS
@@ -38,14 +37,22 @@ set(INC_SYS
 
 set(SRC
 	intern/ikplugin_api.c
-	intern/iksolver_plugin.c
 
 	BIK_api.h
 	intern/ikplugin_api.h
-	intern/iksolver_plugin.h
-	intern/itasc_plugin.h
 )
 
+if(WITH_IK_SOLVER)
+	add_definitions(-DWITH_IK_SOLVER)
+	list(APPEND INC
+		../../../intern/iksolver/extern
+	)
+	list(APPEND SRC
+		intern/iksolver_plugin.c
+		intern/iksolver_plugin.h
+	)
+endif()
+
 if(WITH_IK_ITASC)
 	add_definitions(-DWITH_IK_ITASC)
 	list(APPEND INC
@@ -54,8 +61,8 @@ if(WITH_IK_ITASC)
 	)
 	list(APPEND SRC
 		intern/itasc_plugin.cpp
+		intern/itasc_plugin.h
 	)
 endif()
 
-
 blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/ikplugin/intern/ikplugin_api.c b/source/blender/ikplugin/intern/ikplugin_api.c
index 147c2b50e31..08d2789451c 100644
--- a/source/blender/ikplugin/intern/ikplugin_api.c
+++ b/source/blender/ikplugin/intern/ikplugin_api.c
@@ -45,13 +45,17 @@
 #include "DNA_armature_types.h"
 
 #include "ikplugin_api.h"
-#include "iksolver_plugin.h"
+
+#ifdef WITH_IK_SOLVER
+#  include "iksolver_plugin.h"
+#endif
 
 #ifdef WITH_IK_ITASC
-#include "itasc_plugin.h"
+#  include "itasc_plugin.h"
 #endif
 
 static IKPlugin ikplugin_tab[] = {
+#ifdef WITH_IK_SOLVER
 	/* Legacy IK solver */
 	{
 		iksolver_initialize_tree,
@@ -61,8 +65,10 @@ static IKPlugin ikplugin_tab[] = {
 		NULL,
 		NULL,
 		NULL,
-#ifdef WITH_IK_ITASC
 	},
+#endif
+
+#ifdef WITH_IK_ITASC
 	/* iTaSC IK solver */
 	{
 		itasc_initialize_tree,
@@ -72,8 +78,8 @@ static IKPlugin ikplugin_tab[] = {
 		itasc_clear_cache,
 		itasc_update_param,
 		itasc_test_constraint,
-#endif
-	}
+	},
+	#endif
 };
 
 static IKPlugin *get_plugin(bPose *pose)
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index 5a71b51c5dd..44991adcc9d 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -110,7 +110,7 @@ endif()
 		ge_scenegraph
 		bf_ikplugin
 		bf_intern_itasc
-		bf_intern_ik
+		bf_intern_iksolver
 		bf_intern_smoke
 		bf_modifiers
 		bf_intern_moto 
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index a3a3a13130c..26ca390239b 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -862,7 +862,6 @@ endif()
 		bf_intern_bsp
 		bf_intern_decimate
 		bf_intern_elbeem
-		bf_intern_ik
 		bf_intern_memutil
 		bf_intern_guardedalloc
 		bf_intern_ctr
@@ -934,6 +933,10 @@ endif()
 		list(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp)
 	endif()
 
+	if(WITH_IK_SOLVER)
+		list_insert_after(BLENDER_SORTED_LIBS "bf_intern_elbeem" "bf_intern_iksolver")
+	endif()
+
 	if(WITH_IK_ITASC)
 		list(APPEND BLENDER_SORTED_LIBS bf_intern_itasc)
 	endif()