Merge pull request #2204 from SSE4:fix_find_glog_gflags

e92f31c7 · Alexander Alekhin · 9ea9b6cf · 7f554682 · e92f31c7 · e92f31c7
Commit e92f31c7 authored Aug 05, 2019 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

FindGflags.cmake modules/sfm/cmake/FindGflags.cmake +1 -1

FindGlog.cmake modules/sfm/cmake/FindGlog.cmake +1 -1

No files found.
--- 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})