Merge pull request #471 from maccesch:master

Author: alalek

modules/sfm/CMakeLists.txt

@@ -5,11 +5,15 @@ set(the_description "SFM algorithms")
 
 find_package(Ceres QUIET)
 
-if(NOT DEFINED SFM_DEPS_OK)
+if(NOT DEFINED GFLAGS_LIBRARIES)
+  set(GFLAGS_LIBRARIES "gflags")
+endif()
 
-  if(NOT DEFINED GLOG_LIBRARIES)
-    set(GLOG_LIBRARIES "glog")
-  endif()
+if(NOT DEFINED GLOG_LIBRARIES)
+  set(GLOG_LIBRARIES "glog")
+endif()
+
+if(NOT DEFINED SFM_DEPS_OK)
 
   set(_fname "${CMAKE_CURRENT_BINARY_DIR}/test_sfm_deps.cpp")
   file(WRITE "${_fname}" "#include <glog/logging.h>\n#include <gflags/gflags.h>\nint main() { (void)(0); return 0; }\n")
@@ -96,7 +100,7 @@ ocv_module_include_directories()
 FILE(GLOB OPENCV_SFM_SRC src/*.cpp)
 
 # define the header files (make the headers appear in IDEs.)
-FILE(GLOB OPENCV_SFM_HDRS include/opencv2/sfm/*.hpp)
+FILE(GLOB OPENCV_SFM_HDRS include/opencv2/sfm.hpp include/opencv2/sfm/*.hpp)
 
 ocv_set_module_sources(HEADERS ${OPENCV_SFM_HDRS}
                        SOURCES ${OPENCV_SFM_SRC})