Move Libmv from extern/ to intern/

Logically it is intern library since being mainly developed by 1.5 blender guys.

build_files/cmake/macros.cmake

@@ -628,7 +628,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		bf_intern_eigen
 		extern_rangetree
 		extern_wcwidth
-		extern_libmv
+		bf_intern_libmv
 		extern_glog
 		extern_gflags
 		extern_sdlew

extern/CMakeLists.txt

@@ -28,7 +28,6 @@ remove_strict_flags()
 
 add_subdirectory(rangetree)
 add_subdirectory(wcwidth)
-add_subdirectory(libmv)
 
 if(WITH_BULLET)
 	if(NOT WITH_SYSTEM_BULLET)

intern/CMakeLists.txt

@@ -27,6 +27,7 @@
 add_subdirectory(string)
 add_subdirectory(ghost)
 add_subdirectory(guardedalloc)
+add_subdirectory(libmv)
 add_subdirectory(memutil)
 add_subdirectory(opencolorio)
 add_subdirectory(mikktspace)

intern/libmv/CMakeLists.txt

@@ -37,17 +37,17 @@ set(SRC
 	libmv-capi.h
 )
 
-add_definitions(${GFLAGS_DEFINES})
-add_definitions(${GLOG_DEFINES})
-add_definitions(${CERES_DEFINES})
-
 if(WITH_LIBMV)
+	add_definitions(${GFLAGS_DEFINES})
+	add_definitions(${GLOG_DEFINES})
+	add_definitions(${CERES_DEFINES})
+
 	list(APPEND INC
-		../gflags/src
-		../glog/src
-		third_party/ceres/include
-		third_party/ceres/config
-		../../intern/guardedalloc
+		../../extern/gflags/src
+		../../extern/glog/src
+		../../extern/ceres/include
+		../../extern/ceres/config
+		../guardedalloc
 	)
 
 	list(APPEND INC_SYS
@@ -235,4 +235,4 @@ else()
 	)
 endif()
 
-blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}")

intern/libmv/bundle.sh

@@ -116,17 +116,17 @@ set(SRC
 	libmv-capi.h
 )
 
-add_definitions(\${GFLAGS_DEFINES})
-add_definitions(\${GLOG_DEFINES})
-add_definitions(\${CERES_DEFINES})
-
 if(WITH_LIBMV)
+	add_definitions(\${GFLAGS_DEFINES})
+	add_definitions(\${GLOG_DEFINES})
+	add_definitions(\${CERES_DEFINES})
+
 	list(APPEND INC
-		../gflags/src
-		../glog/src
-		third_party/ceres/include
-		third_party/ceres/config
-		../../intern/guardedalloc
+		../../extern/gflags/src
+		../../extern/glog/src
+		../../extern/ceres/include
+		../../extern/ceres/config
+		../guardedalloc
 	)
 
 	list(APPEND INC_SYS
@@ -183,5 +183,5 @@ else()
 	)
 endif()
 
-blender_add_lib(extern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}")
+blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}")
 EOF

source/blender/blenkernel/CMakeLists.txt

@@ -49,7 +49,7 @@ set(INC
 	../../../intern/raskter
 	../../../intern/smoke/extern
 	../../../intern/atomic
-	../../../extern/libmv
+	../../../intern/libmv
 
 	# XXX - BAD LEVEL CALL WM_api.h
 	../windowmanager

source/blenderplayer/CMakeLists.txt

@@ -173,7 +173,7 @@ endif()
 		bf_intern_eigen
 		extern_rangetree
 		extern_wcwidth
-		extern_libmv
+		bf_intern_libmv
 		extern_glog
 		extern_gflags
 		extern_sdlew

source/creator/CMakeLists.txt

@@ -49,7 +49,7 @@ if(WIN32)
 endif()
 
 if(WITH_LIBMV)
-	blender_include_dirs(../../extern/libmv)
+	blender_include_dirs(../../intern/libmv)
 	add_definitions(-DWITH_LIBMV)
 endif()