Move Libmv from extern/ to intern/
Logically it is intern library since being mainly developed by 1.5 blender guys.
This commit is contained in:
parent
6fb6a08bf8
commit
ba432299cd
|
@ -628,7 +628,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
|
||||||
bf_intern_eigen
|
bf_intern_eigen
|
||||||
extern_rangetree
|
extern_rangetree
|
||||||
extern_wcwidth
|
extern_wcwidth
|
||||||
extern_libmv
|
bf_intern_libmv
|
||||||
extern_glog
|
extern_glog
|
||||||
extern_gflags
|
extern_gflags
|
||||||
extern_sdlew
|
extern_sdlew
|
||||||
|
|
|
@ -28,7 +28,6 @@ remove_strict_flags()
|
||||||
|
|
||||||
add_subdirectory(rangetree)
|
add_subdirectory(rangetree)
|
||||||
add_subdirectory(wcwidth)
|
add_subdirectory(wcwidth)
|
||||||
add_subdirectory(libmv)
|
|
||||||
|
|
||||||
if(WITH_BULLET)
|
if(WITH_BULLET)
|
||||||
if(NOT WITH_SYSTEM_BULLET)
|
if(NOT WITH_SYSTEM_BULLET)
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
add_subdirectory(string)
|
add_subdirectory(string)
|
||||||
add_subdirectory(ghost)
|
add_subdirectory(ghost)
|
||||||
add_subdirectory(guardedalloc)
|
add_subdirectory(guardedalloc)
|
||||||
|
add_subdirectory(libmv)
|
||||||
add_subdirectory(memutil)
|
add_subdirectory(memutil)
|
||||||
add_subdirectory(opencolorio)
|
add_subdirectory(opencolorio)
|
||||||
add_subdirectory(mikktspace)
|
add_subdirectory(mikktspace)
|
||||||
|
|
|
@ -37,17 +37,17 @@ set(SRC
|
||||||
libmv-capi.h
|
libmv-capi.h
|
||||||
)
|
)
|
||||||
|
|
||||||
add_definitions(${GFLAGS_DEFINES})
|
|
||||||
add_definitions(${GLOG_DEFINES})
|
|
||||||
add_definitions(${CERES_DEFINES})
|
|
||||||
|
|
||||||
if(WITH_LIBMV)
|
if(WITH_LIBMV)
|
||||||
|
add_definitions(${GFLAGS_DEFINES})
|
||||||
|
add_definitions(${GLOG_DEFINES})
|
||||||
|
add_definitions(${CERES_DEFINES})
|
||||||
|
|
||||||
list(APPEND INC
|
list(APPEND INC
|
||||||
../gflags/src
|
../../extern/gflags/src
|
||||||
../glog/src
|
../../extern/glog/src
|
||||||
third_party/ceres/include
|
../../extern/ceres/include
|
||||||
third_party/ceres/config
|
../../extern/ceres/config
|
||||||
../../intern/guardedalloc
|
../guardedalloc
|
||||||
)
|
)
|
||||||
|
|
||||||
list(APPEND INC_SYS
|
list(APPEND INC_SYS
|
||||||
|
@ -235,4 +235,4 @@ else()
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")
|
blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}")
|
|
@ -116,17 +116,17 @@ set(SRC
|
||||||
libmv-capi.h
|
libmv-capi.h
|
||||||
)
|
)
|
||||||
|
|
||||||
add_definitions(\${GFLAGS_DEFINES})
|
|
||||||
add_definitions(\${GLOG_DEFINES})
|
|
||||||
add_definitions(\${CERES_DEFINES})
|
|
||||||
|
|
||||||
if(WITH_LIBMV)
|
if(WITH_LIBMV)
|
||||||
|
add_definitions(\${GFLAGS_DEFINES})
|
||||||
|
add_definitions(\${GLOG_DEFINES})
|
||||||
|
add_definitions(\${CERES_DEFINES})
|
||||||
|
|
||||||
list(APPEND INC
|
list(APPEND INC
|
||||||
../gflags/src
|
../../extern/gflags/src
|
||||||
../glog/src
|
../../extern/glog/src
|
||||||
third_party/ceres/include
|
../../extern/ceres/include
|
||||||
third_party/ceres/config
|
../../extern/ceres/config
|
||||||
../../intern/guardedalloc
|
../guardedalloc
|
||||||
)
|
)
|
||||||
|
|
||||||
list(APPEND INC_SYS
|
list(APPEND INC_SYS
|
||||||
|
@ -183,5 +183,5 @@ else()
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
blender_add_lib(extern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}")
|
blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}")
|
||||||
EOF
|
EOF
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue