Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-08-18 17:36:29 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-08-18 17:36:29 +0400
commit47e313ec0cb367e3fcd8fa7aa8adeeb8a4580f13 (patch)
treeab51bfc11de85f335db533f40c5112c07e5edd12 /intern
parent9e742ffc2b4b99b076cfb66ba491a9fbfc5825c2 (diff)
cmake option to build without iksolver
Diffstat (limited to 'intern')
-rw-r--r--intern/CMakeLists.txt5
-rw-r--r--intern/iksolver/CMakeLists.txt2
-rw-r--r--intern/iksolver/SConscript2
3 files changed, 6 insertions, 3 deletions
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt
index 2b4a84d6b39..d520ffc87b4 100644
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@ -28,7 +28,6 @@ add_subdirectory(ghost)
add_subdirectory(guardedalloc)
add_subdirectory(moto)
add_subdirectory(memutil)
-add_subdirectory(iksolver)
add_subdirectory(opennl)
add_subdirectory(mikktspace)
add_subdirectory(raskter)
@@ -58,6 +57,10 @@ if(WITH_MOD_BOOLEAN)
add_subdirectory(bsp)
endif()
+if(WITH_IK_SOLVER)
+ add_subdirectory(iksolver)
+endif()
+
if(WITH_IK_ITASC)
add_subdirectory(itasc)
endif()
diff --git a/intern/iksolver/CMakeLists.txt b/intern/iksolver/CMakeLists.txt
index 119cb6eaff0..711a70ff260 100644
--- a/intern/iksolver/CMakeLists.txt
+++ b/intern/iksolver/CMakeLists.txt
@@ -73,4 +73,4 @@ set(SRC
intern/TNT/version.h
)
-blender_add_lib(bf_intern_ik "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_iksolver "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/iksolver/SConscript b/intern/iksolver/SConscript
index bdf7cd350ff..b88d3b1b713 100644
--- a/intern/iksolver/SConscript
+++ b/intern/iksolver/SConscript
@@ -5,5 +5,5 @@ sources = env.Glob('intern/*.cpp')
incs = 'intern ../moto/include ../memutil'
-env.BlenderLib ('bf_intern_ik', sources, Split(incs), [], libtype=['intern','player'], priority=[100,90] )
+env.BlenderLib ('bf_intern_iksolver', sources, Split(incs), [], libtype=['intern','player'], priority=[100,90] )