From eef53c29eb022bbe495a726f6f1f52ea855f64e4 Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Wed, 13 Sep 2017 13:59:54 -0400 Subject: [PATCH] Merge pull request #1358 from fmigneault:sfm-fix Fix SFM compilation problem with Windows not finding libmv directory (#1358) * cmake fix sfm module * cmake dir fix * add cmake bin dir + module part of world --- modules/sfm/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/sfm/CMakeLists.txt b/modules/sfm/CMakeLists.txt index 75768927e..26603b591 100644 --- a/modules/sfm/CMakeLists.txt +++ b/modules/sfm/CMakeLists.txt @@ -1,3 +1,4 @@ +set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) set(the_description "SFM algorithms") @@ -39,7 +40,7 @@ endif() ### LIBMV LIGHT DEFINITIONS ### set(LIBMV_LIGHT_INCLUDES - src/libmv_light + "${CMAKE_CURRENT_LIST_DIR}/src/libmv_light" "${OpenCV_SOURCE_DIR}/include/opencv" "${GLOG_INCLUDE_DIRS}" "${GFLAGS_INCLUDE_DIRS}" @@ -113,7 +114,7 @@ if(NOT CMAKE_VERSION VERSION_LESS 2.8.11) # See ocv_target_include_directories() endif() endif() include_directories(${OCV_TARGET_INCLUDE_DIRS_${the_module}}) -add_subdirectory(src/libmv_light) +add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/src/libmv_light" "${CMAKE_CURRENT_BINARY_DIR}/src/libmv") ocv_target_link_libraries(${the_module} ${LIBMV_LIGHT_LIBS})