Skip to content

O
opencv_contrib
Commit e92f31c7 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #2204 from SSE4:fix_find_glog_gflags

parents 9ea9b6cf 7f554682
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/sfm/cmake/FindGflags.cmake
View file @ e92f31c7
...@@ -482,7 +482,7 @@ if (NOT GFLAGS_FOUND) ...@@ -482,7 +482,7 @@ if (NOT GFLAGS_FOUND)
endif (NOT GFLAGS_INCLUDE_DIR OR endif (NOT GFLAGS_INCLUDE_DIR OR
NOT EXISTS ${GFLAGS_INCLUDE_DIR}) 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} PATHS ${GFLAGS_LIBRARY_DIR_HINTS}
${GFLAGS_CHECK_LIBRARY_DIRS} ${GFLAGS_CHECK_LIBRARY_DIRS}
PATH_SUFFIXES ${GFLAGS_CHECK_LIBRARY_SUFFIXES}) PATH_SUFFIXES ${GFLAGS_CHECK_LIBRARY_SUFFIXES})
......
modules/sfm/cmake/FindGlog.cmake
View file @ e92f31c7
...@@ -148,7 +148,7 @@ if (NOT GLOG_INCLUDE_DIR OR ...@@ -148,7 +148,7 @@ if (NOT GLOG_INCLUDE_DIR OR
endif (NOT GLOG_INCLUDE_DIR OR endif (NOT GLOG_INCLUDE_DIR OR
NOT EXISTS ${GLOG_INCLUDE_DIR}) NOT EXISTS ${GLOG_INCLUDE_DIR})
find_library(GLOG_LIBRARY NAMES glog find_library(GLOG_LIBRARY NAMES glog glogd
PATHS ${GLOG_LIBRARY_DIR_HINTS} PATHS ${GLOG_LIBRARY_DIR_HINTS}
${GLOG_CHECK_LIBRARY_DIRS} ${GLOG_CHECK_LIBRARY_DIRS}
PATH_SUFFIXES ${GLOG_CHECK_LIBRARY_SUFFIXES}) PATH_SUFFIXES ${GLOG_CHECK_LIBRARY_SUFFIXES})
......
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