Skip to content

Commit eef53c2

Browse files
fmigneaultalalek
authored andcommitted
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
1 parent 3066970 commit eef53c2

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

modules/sfm/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
12
set(the_description "SFM algorithms")
23

34

@@ -39,7 +40,7 @@ endif()
3940
### LIBMV LIGHT DEFINITIONS ###
4041

4142
set(LIBMV_LIGHT_INCLUDES
42-
src/libmv_light
43+
"${CMAKE_CURRENT_LIST_DIR}/src/libmv_light"
4344
"${OpenCV_SOURCE_DIR}/include/opencv"
4445
"${GLOG_INCLUDE_DIRS}"
4546
"${GFLAGS_INCLUDE_DIRS}"
@@ -113,7 +114,7 @@ if(NOT CMAKE_VERSION VERSION_LESS 2.8.11) # See ocv_target_include_directories()
113114
endif()
114115
endif()
115116
include_directories(${OCV_TARGET_INCLUDE_DIRS_${the_module}})
116-
add_subdirectory(src/libmv_light)
117+
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/src/libmv_light" "${CMAKE_CURRENT_BINARY_DIR}/src/libmv")
117118

118119
ocv_target_link_libraries(${the_module} ${LIBMV_LIGHT_LIBS})
119120

0 commit comments

Comments
 (0)