Commit eef53c29 authored by Francis Charette Migneault's avatar Francis Charette Migneault Committed by Alexander Alekhin

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
parent 30669702
set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
set(the_description "SFM algorithms") set(the_description "SFM algorithms")
...@@ -39,7 +40,7 @@ endif() ...@@ -39,7 +40,7 @@ endif()
### LIBMV LIGHT DEFINITIONS ### ### LIBMV LIGHT DEFINITIONS ###
set(LIBMV_LIGHT_INCLUDES set(LIBMV_LIGHT_INCLUDES
src/libmv_light "${CMAKE_CURRENT_LIST_DIR}/src/libmv_light"
"${OpenCV_SOURCE_DIR}/include/opencv" "${OpenCV_SOURCE_DIR}/include/opencv"
"${GLOG_INCLUDE_DIRS}" "${GLOG_INCLUDE_DIRS}"
"${GFLAGS_INCLUDE_DIRS}" "${GFLAGS_INCLUDE_DIRS}"
...@@ -113,7 +114,7 @@ if(NOT CMAKE_VERSION VERSION_LESS 2.8.11) # See ocv_target_include_directories() ...@@ -113,7 +114,7 @@ if(NOT CMAKE_VERSION VERSION_LESS 2.8.11) # See ocv_target_include_directories()
endif() endif()
endif() endif()
include_directories(${OCV_TARGET_INCLUDE_DIRS_${the_module}}) 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}) ocv_target_link_libraries(${the_module} ${LIBMV_LIGHT_LIBS})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment