Merge remote-tracking branch 'refs/remotes/origin/develop'

README.md

@@ -18,6 +18,11 @@ The Regard3D source code is released under the [MIT license](http://opensource.o
 Version history
 ---------------
 
+### Version 0.9.4, 04.01.2018:
+- Upgraded to OpenMVG 1.3
+- Added SMVS as new densification tool
+- Added new algorithms for pairwise feature matching: KGraph, MRPT
+
 ### Version 0.9.3, 15.09.2017:
 - Added user-defined camera sensor width database, added ability to set focus length
 - Added possibility to set camera model (Pinhole with various distortions, among them Fisheye)

src/CMakeLists.txt

@@ -165,7 +165,7 @@ ELSE(MSVC)
 	ENDIF(MSYS)
 ENDIF(MSVC)
 #SET(Boost_DEBUG TRUE)
-FIND_PACKAGE( Boost 1.53.0 REQUIRED date_time thread
+FIND_PACKAGE( Boost 1.53.0 REQUIRED date_time timer thread
 	system chrono serialization filesystem locale)
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 IF(WIN32 AND CMAKE_COMPILER_IS_GNUCC)
@@ -461,7 +461,7 @@ endforeach()
 message("OPENMVG_INCLUDE_DIRS: ${OPENMVG_INCLUDE_DIRS}")
 INCLUDE_DIRECTORIES(${OPENMVG_INCLUDE_DIRS})
 
-SET_TARGET_PROPERTIES(${OPENMVG_LIBRARIES} PROPERTIES MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE)
+#SET_TARGET_PROPERTIES(${OPENMVG_LIBRARIES} PROPERTIES MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE)
 
 IF(DEFINED OPENMVG_VERSION)
 	SET(R3D_HAVE_OPENMVG_VERSION TRUE)
@@ -520,8 +520,8 @@ ENDIF(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 IF(MSVC)
 	SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${R3D_COMPILER_ARCH} /bigobj /MP" )
 	SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${R3D_COMPILER_ARCH} /bigobj /MP" )
-#	SET( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Ox /Ob2 /Oi /Ot /GL /GS- ${R3D_COMPILER_ARCH} /fp:fast /MP" )
-#	SET( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox /Ob2 /Oi /Ot /GL /GS- ${R3D_COMPILER_ARCH} /fp:fast /MP" )
+	SET( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Ox /Ob2 /Oi /Ot /GL /GS- ${R3D_COMPILER_ARCH} /fp:fast /MP" )
+	SET( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox /Ob2 /Oi /Ot /GL /GS- ${R3D_COMPILER_ARCH} /fp:fast /MP" )
 
 	SET( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /INCREMENTAL:NO /NODEFAULTLIB:libcmt.lib /LTCG" )
 	SET( CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:libcmt.lib" )
@@ -611,6 +611,17 @@ INCLUDE_DIRECTORIES(thirdparty/sqlite)
 ADD_SUBDIRECTORY(thirdparty/kgraph)
 INCLUDE_DIRECTORIES(thirdparty/kgraph)
 
+# EFANNA
+INCLUDE_DIRECTORIES(thirdparty/efanna)
+
+# MRPT
+INCLUDE_DIRECTORIES(thirdparty/mrpt)
+
+# CPUID
+ADD_SUBDIRECTORY(thirdparty/cpuid)
+INCLUDE_DIRECTORIES(thirdparty/cpuid/cpuid)
+
+
 ## Organize source files in folders
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
@@ -687,7 +698,7 @@ SET(REGARD3D_LINK_LIBRARIES ${REGARD3D_LINK_LIBRARIES} ${OPENSCENEGRAPH_LIBRARIE
 	${Boost_LIBRARIES} daisy AKAZE fast-akaze liop kgraph sqlite ${OpenCV_LIBRARIES} ${OPENMVG_LIBRARIES}
 	${CERES_LIBRARIES} ${GLOG_LIBRARIES} ${SuiteSparse_LIBRARIES} ${FLANN_LIBRARIES}
 	easyexif ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ${ASSIMP_LIBRARIES} ${OPENGL_LIBRARIES}
-	optimized;minilog;debug;minilog_d tinyply)
+	optimized;minilog;debug;minilog_d tinyply cpuid)
 
 IF(MKL_FOUND)
 	SET(REGARD3D_LINK_LIBRARIES ${REGARD3D_LINK_LIBRARIES} ${MKL_LIBRARIES} )