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/extern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-02-18 14:45:46 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-02-18 14:45:46 +0400
commit971b0f1ed63c5d82c8e2956573affa663837543d (patch)
tree7b2b04a7ddae9478a455435869d1dd3a693cf57f /extern
parent5cc377022b810cb2ab291a0064e5749b976e185a (diff)
Correction to cmake rules for libmv/ceres
libmv still requires optimization switched off because of some incompatibility of SSBA and MSVC optimizer which makes bundle adjustment work just wrong. This shall not be an issue for Ceres and no need to disable optimization for extern_ceres
Diffstat (limited to 'extern')
-rw-r--r--extern/libmv/CMakeLists.txt4
-rwxr-xr-xextern/libmv/bundle.sh2
2 files changed, 4 insertions, 2 deletions
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
index a51f576d965..6b5a9a3b67a 100644
--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
@@ -26,6 +26,8 @@
# If you're doing changes in this file, please update template
# in that script too
+add_subdirectory(third_party)
+
set(INC
.
../colamd/Include
@@ -243,5 +245,3 @@ add_definitions(
)
blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")
-
-add_subdirectory(third_party)
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh
index 23e90fc8f7d..27f964ad5b3 100755
--- a/extern/libmv/bundle.sh
+++ b/extern/libmv/bundle.sh
@@ -122,6 +122,8 @@ cat > CMakeLists.txt << EOF
# If you're doing changes in this file, please update template
# in that script too
+add_subdirectory(third_party)
+
set(INC
.
../colamd/Include