From 3d903ee3ffcc5628adfe3dba44bdb314d6646022 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Tue, 25 Oct 2011 12:37:42 +0000
Subject: Libraries upgrade:

- Upgrade Eigen2 library to Eigen3
- Upgrade colamd library and placed in extern/ so other libraries from extern/ can use it

NOTE: With previous version of Eigen (3.0.1) it was necessary to define
      EIGEN_DONT_ALIGN_STATICALLY macro to make it compilable on windows 32bit.
      After latest upgrade it seems to be unnecessary (at least when was testing libmv),
      so i removed that defines which can reduce speed and lead to other problems.
---
 extern/colamd/CMakeLists.txt           |  5 ++---
 intern/itasc/CMakeLists.txt            | 11 +----------
 intern/itasc/SConscript                |  3 ---
 source/blender/ikplugin/CMakeLists.txt |  4 ----
 source/blender/ikplugin/SConscript     |  3 ---
 5 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/extern/colamd/CMakeLists.txt b/extern/colamd/CMakeLists.txt
index 5b565518e4f..34389f5efd0 100644
--- a/extern/colamd/CMakeLists.txt
+++ b/extern/colamd/CMakeLists.txt
@@ -23,7 +23,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-	Include
+	./Include
 )
 
 set(INC_SYS
@@ -34,8 +34,7 @@ set(SRC
 	Source/colamd.c
 	Source/colamd_global.c
 
-	Include/colamd.h
-	Include/UFconfig.h
+	Include//colamd.h
 )
 
 blender_add_lib(extern_colamd "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt
index 3d24a0cb8c6..88ba8e6b8a8 100644
--- a/intern/itasc/CMakeLists.txt
+++ b/intern/itasc/CMakeLists.txt
@@ -46,8 +46,6 @@ set(SRC
 	WSDLSSolver.cpp
 	WorldObject.cpp
 	eigen_types.cpp
-	ublas_types.hpp
-
 	kdl/chain.cpp
 	kdl/chainfksolverpos_recursive.cpp
 	kdl/chainjnttojacsolver.cpp
@@ -115,10 +113,7 @@ set(SRC
 	kdl/utilities/traits.h
 	kdl/utilities/utility.h
 	kdl/utilities/utility_io.h
-
-	kdl/frameacc.inl
-	kdl/frames.inl
-	kdl/framevel.inl
+	ublas_types.hpp
 
 	# until we have another user...
 	../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
@@ -318,8 +313,4 @@ set(SRC
 	../../extern/Eigen3/Eigen/src/Cholesky/LLT.h
 )
 
-if(WIN32)
-	add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY)
-endif()
-
 blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/itasc/SConscript b/intern/itasc/SConscript
index 69dddf40228..c1ad931c665 100644
--- a/intern/itasc/SConscript
+++ b/intern/itasc/SConscript
@@ -9,8 +9,5 @@ incs = '. ../../extern/Eigen3'
 
 defs = []
 
-if env['PLATFORM'] == 'win32':
-    defs.append('EIGEN_DONT_ALIGN_STATICALLY')
-
 env.BlenderLib ('bf_intern_itasc', sources, Split(incs), defs, libtype=['intern','player'], priority=[20,100] )
 
diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt
index 87b0c6c671a..518fc9a99ea 100644
--- a/source/blender/ikplugin/CMakeLists.txt
+++ b/source/blender/ikplugin/CMakeLists.txt
@@ -57,8 +57,4 @@ if(WITH_IK_ITASC)
 	)
 endif()
 
-if(WIN32)
-	add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY)
-endif()
-
 blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/ikplugin/SConscript b/source/blender/ikplugin/SConscript
index 4cff3399fdc..38c53894df8 100644
--- a/source/blender/ikplugin/SConscript
+++ b/source/blender/ikplugin/SConscript
@@ -8,7 +8,4 @@ incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen3'
 
 defs.append('WITH_IK_ITASC')
 
-if env['PLATFORM'] == 'win32':
-    defs.append('EIGEN_DONT_ALIGN_STATICALLY')
-
 env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), defs, libtype=['core','player'], priority=[180, 190] )
-- 
cgit v1.2.3