Merge pull request #2204 from SSE4:fix_find_glog_gflags

6 years ago · e92f31c7ea
parent 9ea9b6cfe3 7f55468235
commit e92f31c7ea
2 changed files with 2 additions and 2 deletions
--- a/modules/sfm/cmake/FindGflags.cmake
+++ b/modules/sfm/cmake/FindGflags.cmake
@ -482,7 +482,7 @@ if (NOT GFLAGS_FOUND)
  endif (NOT GFLAGS_INCLUDE_DIR OR
    NOT EXISTS ${GFLAGS_INCLUDE_DIR})

-  find_library(GFLAGS_LIBRARY NAMES gflags
+  find_library(GFLAGS_LIBRARY NAMES gflags gflags_debug gflags_nothreads gflags_nothreads_debug
    PATHS ${GFLAGS_LIBRARY_DIR_HINTS}
    ${GFLAGS_CHECK_LIBRARY_DIRS}
    PATH_SUFFIXES ${GFLAGS_CHECK_LIBRARY_SUFFIXES})
--- a/modules/sfm/cmake/FindGlog.cmake
+++ b/modules/sfm/cmake/FindGlog.cmake
@ -148,7 +148,7 @@ if (NOT GLOG_INCLUDE_DIR OR
 endif (NOT GLOG_INCLUDE_DIR OR
       NOT EXISTS ${GLOG_INCLUDE_DIR})

-find_library(GLOG_LIBRARY NAMES glog
+find_library(GLOG_LIBRARY NAMES glog glogd
  PATHS ${GLOG_LIBRARY_DIR_HINTS}
  ${GLOG_CHECK_LIBRARY_DIRS}
  PATH_SUFFIXES ${GLOG_CHECK_LIBRARY_SUFFIXES})