diff options
19 files changed, 18 insertions, 20 deletions
diff --git a/build_files/cmake/cmake_consistency_check_config.py b/build_files/cmake/cmake_consistency_check_config.py index 1f75b9884bc..5345f682f58 100644 --- a/build_files/cmake/cmake_consistency_check_config.py +++ b/build_files/cmake/cmake_consistency_check_config.py @@ -10,9 +10,6 @@ IGNORE = ( "/ik_glut_test/", # specific source files - "extern/Eigen2/Eigen/src/Cholesky/CholeskyInstantiations.cpp", - "extern/Eigen2/Eigen/src/Core/CoreInstantiations.cpp", - "extern/Eigen2/Eigen/src/QR/QrInstantiations.cpp", "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp", "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp", "extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp", diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 74ef7b18de1..39c12f2c4d9 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -626,12 +626,12 @@ function(SETUP_BLENDER_SORTED_LIBS) cycles_subd bf_intern_raskter bf_intern_opencolorio + bf_intern_eigen extern_rangetree extern_wcwidth extern_libmv extern_glog extern_sdlew - extern_eigen3 bf_intern_glew_mx ) diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 93f57b04d4e..d0c587b80e4 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -29,7 +29,6 @@ remove_strict_flags() add_subdirectory(rangetree) add_subdirectory(wcwidth) add_subdirectory(libmv) -add_subdirectory(Eigen3) if(WITH_OPENNL) add_subdirectory(colamd) diff --git a/extern/SConscript b/extern/SConscript index 484c0e959c2..46c177c5bcb 100644 --- a/extern/SConscript +++ b/extern/SConscript @@ -11,7 +11,6 @@ SConscript(['colamd/SConscript']) SConscript(['rangetree/SConscript']) SConscript(['wcwidth/SConscript']) SConscript(['libmv/SConscript']) -SConscript(['Eigen3/SConscript']) if env['WITH_BF_GAMEENGINE']: SConscript(['recastnavigation/SConscript']) diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index 4ee3dff7695..9b0f2de22f2 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -32,6 +32,7 @@ add_subdirectory(opencolorio) add_subdirectory(mikktspace) add_subdirectory(raskter) add_subdirectory(glew-mx) +add_subdirectory(eigen) if(WITH_AUDASPACE) add_subdirectory(audaspace) diff --git a/intern/SConscript b/intern/SConscript index 124afd4bbb9..3b855d60ac8 100644 --- a/intern/SConscript +++ b/intern/SConscript @@ -35,6 +35,7 @@ SConscript(['string/SConscript', 'memutil/SConscript/', 'iksolver/SConscript', 'itasc/SConscript', + 'eigen/SConscript', 'opencolorio/SConscript', 'opennl/SConscript', 'mikktspace/SConscript', diff --git a/extern/Eigen3/CMakeLists.txt b/intern/eigen/CMakeLists.txt index e3b63881aca..58964e43224 100644 --- a/extern/Eigen3/CMakeLists.txt +++ b/intern/eigen/CMakeLists.txt @@ -28,10 +28,11 @@ set(INC ) set(INC_SYS + ${EIGEN3_INCLUDE_DIRS} ) set(SRC - eigen3_capi.h + eigen_capi.h intern/eigenvalues.cc intern/svd.cc @@ -40,4 +41,4 @@ set(SRC intern/svd.h ) -blender_add_lib(extern_eigen3 "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_intern_eigen "${SRC}" "${INC}" "${INC_SYS}") diff --git a/extern/Eigen3/SConscript b/intern/eigen/SConscript index 2dc2d623768..0c98ec1837d 100644 --- a/extern/Eigen3/SConscript +++ b/intern/eigen/SConscript @@ -29,7 +29,7 @@ Import('env') sources = env.Glob('intern/*.cc') -incs = '.' +incs = '. #/extern/Eigen3' defs = [] -env.BlenderLib('extern_eigen3', sources, Split(incs), defs, libtype=['extern','player'], priority=[10, 185]) +env.BlenderLib('bf_intern_eigen', sources, Split(incs), defs, libtype=['extern','player'], priority=[10, 185]) diff --git a/extern/Eigen3/eigen3_capi.h b/intern/eigen/eigen_capi.h index f8a7b3cbb77..45ee1c015ec 100644 --- a/extern/Eigen3/eigen3_capi.h +++ b/intern/eigen/eigen_capi.h @@ -24,10 +24,10 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __EIGEN3_C_API_H__ -#define __EIGEN3_C_API_H__ +#ifndef __EIGEN_C_API_H__ +#define __EIGEN_C_API_H__ #include "intern/eigenvalues.h" #include "intern/svd.h" -#endif /* __EIGEN3_C_API_H__ */ +#endif /* __EIGEN_C_API_H__ */ diff --git a/extern/Eigen3/intern/eigenvalues.cc b/intern/eigen/intern/eigenvalues.cc index dcaaee8e9c2..dcaaee8e9c2 100644 --- a/extern/Eigen3/intern/eigenvalues.cc +++ b/intern/eigen/intern/eigenvalues.cc diff --git a/extern/Eigen3/intern/eigenvalues.h b/intern/eigen/intern/eigenvalues.h index 93fc06c2339..93fc06c2339 100644 --- a/extern/Eigen3/intern/eigenvalues.h +++ b/intern/eigen/intern/eigenvalues.h diff --git a/extern/Eigen3/intern/svd.cc b/intern/eigen/intern/svd.cc index e39a8261edb..e39a8261edb 100644 --- a/extern/Eigen3/intern/svd.cc +++ b/intern/eigen/intern/svd.cc diff --git a/extern/Eigen3/intern/svd.h b/intern/eigen/intern/svd.h index 0ac51108977..0ac51108977 100644 --- a/extern/Eigen3/intern/svd.h +++ b/intern/eigen/intern/svd.h diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 45b41a4a098..944ba60eb58 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -29,13 +29,13 @@ set(INC ../makesdna ../../../intern/guardedalloc ../../../intern/atomic + ../../../intern/eigen ../../../extern/wcwidth ) set(INC_SYS ${ZLIB_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} - ../../../extern/Eigen3 ) set(SRC diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 0e4b9bf4efd..5f92741fde2 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -34,9 +34,9 @@ cflags='' incs = [ '.', '#/extern/wcwidth', - '#/extern/Eigen3', '#/intern/guardedalloc', '#/intern/atomic', + '#/intern/eigen', '../makesdna', env['BF_FREETYPE_INC'], env['BF_ZLIB_INC'], diff --git a/source/blender/blenlib/intern/math_solvers.c b/source/blender/blenlib/intern/math_solvers.c index d1dad9a6269..c27c6bea160 100644 --- a/source/blender/blenlib/intern/math_solvers.c +++ b/source/blender/blenlib/intern/math_solvers.c @@ -34,7 +34,7 @@ #include "BLI_strict_flags.h" -#include "eigen3_capi.h" +#include "eigen_capi.h" /********************************** Eigen Solvers *********************************/ diff --git a/source/blender/physics/CMakeLists.txt b/source/blender/physics/CMakeLists.txt index 855449ca0f3..0a4ff3fe0f0 100644 --- a/source/blender/physics/CMakeLists.txt +++ b/source/blender/physics/CMakeLists.txt @@ -34,7 +34,7 @@ set(INC ) set(INC_SYS - ../../../extern/Eigen3 + ${EIGEN3_INCLUDE_DIRS} ) set(SRC diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 11055ab77bd..f3a65c4d75e 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -171,12 +171,12 @@ endif() bf_intern_opencolorio bf_intern_opennl bf_intern_glew_mx + bf_intern_eigen extern_rangetree extern_wcwidth extern_libmv extern_glog extern_sdlew - extern_eigen3 ) if(WITH_MOD_CLOTH_ELTOPO) diff --git a/tests/gtests/blenlib/CMakeLists.txt b/tests/gtests/blenlib/CMakeLists.txt index e10d6b13b59..443d9b0e84b 100644 --- a/tests/gtests/blenlib/CMakeLists.txt +++ b/tests/gtests/blenlib/CMakeLists.txt @@ -37,11 +37,11 @@ set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${PLATFORM_LIN BLENDER_TEST(BLI_stack "bf_blenlib") BLENDER_TEST(BLI_math_color "bf_blenlib") -BLENDER_TEST(BLI_math_geom "bf_blenlib;extern_eigen3") +BLENDER_TEST(BLI_math_geom "bf_blenlib;bf_intern_eigen") BLENDER_TEST(BLI_math_base "bf_blenlib") BLENDER_TEST(BLI_string "bf_blenlib") BLENDER_TEST(BLI_path_util "bf_blenlib;extern_wcwidth;${ZLIB_LIBRARIES}") -BLENDER_TEST(BLI_polyfill2d "bf_blenlib;extern_eigen3") +BLENDER_TEST(BLI_polyfill2d "bf_blenlib;bf_intern_eigen") BLENDER_TEST(BLI_listbase "bf_blenlib") BLENDER_TEST(BLI_hash_mm2a "bf_blenlib") BLENDER_TEST(BLI_ghash "bf_blenlib") |