Merge branch 'master' into blender2.8

[blender.git] / source / blender / ikplugin / CMakeLists.txt

diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt
index dc637aedd6db3e79a8aca014ba5d9dd9dc4dc1e7..8991e113410d364bda8547b067f464577dea0144 100644 (file)
--- a/source/blender/ikplugin/CMakeLists.txt
+++ b/source/blender/ikplugin/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id: CMakeLists.txt 20156 2009-05-11 16:31:30Z ben2610 $
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -24,13 +23,14 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
+remove_extra_strict_flags()
+
 set(INC 
        .
        ../blenkernel
        ../blenlib
        ../makesdna
        ../../../intern/guardedalloc
-       ../../../intern/iksolver/extern
 )
 
 set(INC_SYS
@@ -39,22 +39,33 @@ 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
-               ../../../extern/Eigen2
                ../../../intern/itasc
        )
+       list(APPEND INC_SYS
+               ${EIGEN3_INCLUDE_DIRS}
+       )
        list(APPEND SRC
                intern/itasc_plugin.cpp
+               intern/itasc_plugin.h
        )
 endif()