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
pull/1287/head^2
Francis Charette Migneault 8 years ago committed by Alexander Alekhin
parent 306697022b
commit eef53c29eb
  1. 5
      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})

Loading…
Cancel
Save