diff options
-rw-r--r-- | extern/libmv/CMakeLists.txt | 3 | ||||
-rw-r--r-- | extern/libmv/SConscript | 3 | ||||
-rw-r--r-- | extern/libmv/third_party/ssba/CMakeLists.txt | 3 | ||||
-rw-r--r-- | extern/libmv/third_party/ssba/SConscript | 1 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt index aabf2324372..0cf2211fe88 100644 --- a/extern/libmv/CMakeLists.txt +++ b/extern/libmv/CMakeLists.txt @@ -35,7 +35,6 @@ set(INC set(INC_SYS ../Eigen3 third_party/ssba - third_party/ldl/Include ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} ) @@ -83,7 +82,6 @@ set(SRC third_party/gflags/gflags.cc third_party/gflags/gflags_completions.cc third_party/gflags/gflags_reporting.cc - third_party/ldl/Source/ldl.c libmv-capi.h libmv/base/id_generator.h @@ -141,7 +139,6 @@ set(SRC third_party/gflags/gflags/gflags.h third_party/gflags/mutex.h third_party/gflags/util.h - third_party/ldl/Include/ldl.h third_party/msinttypes/inttypes.h third_party/msinttypes/stdint.h ) diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript index 42e96e230ea..a0ab5bd61d7 100644 --- a/extern/libmv/SConscript +++ b/extern/libmv/SConscript @@ -22,7 +22,6 @@ src += env.Glob('libmv/simple_pipeline/*.cc') src += env.Glob('libmv/tracking/*.cc') src += env.Glob('third_party/fast/*.c') src += env.Glob('third_party/gflags/*.cc') -src += env.Glob('third_party/ldl/Source/*.c') incs = '. ../Eigen3 third_party/ceres/include' incs += ' ' + env['BF_PNG_INC'] @@ -39,7 +38,7 @@ else: src += env.Glob("third_party/glog/src/*.cc") incs += ' ./third_party/glog/src' -incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include' +incs += ' ./third_party/ssba ../colamd/Include' env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137] ) diff --git a/extern/libmv/third_party/ssba/CMakeLists.txt b/extern/libmv/third_party/ssba/CMakeLists.txt index f73a6137d6f..72379625396 100644 --- a/extern/libmv/third_party/ssba/CMakeLists.txt +++ b/extern/libmv/third_party/ssba/CMakeLists.txt @@ -42,6 +42,9 @@ set(SRC Math/v3d_linear_utils.h Math/v3d_mathutilities.h Math/v3d_optimization.h + + ../ldl/Source/ldl.c + ../ldl/Include/ldl.h ) if(WIN32) diff --git a/extern/libmv/third_party/ssba/SConscript b/extern/libmv/third_party/ssba/SConscript index 598415d0039..667b40f929b 100644 --- a/extern/libmv/third_party/ssba/SConscript +++ b/extern/libmv/third_party/ssba/SConscript @@ -15,6 +15,7 @@ defs.append('V3DLIB_ENABLE_SUITESPARSE') src = env.Glob('Geometry/*.cpp') src += env.Glob('Math/*.cpp') +src += env.Glob('../ldl/Source/*.c') incs = '. ../ldl/Include ../../../colamd/Include' diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index a5d7763487f..bb10bdd0bae 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -923,8 +923,8 @@ endif() if(WITH_LIBMV) list(APPEND BLENDER_SORTED_LIBS extern_libmv) - list(APPEND BLENDER_SORTED_LIBS extern_ceres) list(APPEND BLENDER_SORTED_LIBS extern_ssba) + list(APPEND BLENDER_SORTED_LIBS extern_ceres) endif() if(WITH_MOD_CLOTH_ELTOPO) |