Merge pull request #3296 from gvcallen:4.x

Allow new glog in SFM CMake Project

* Allow new glog in SFM CMakeLists.txt

* Fix typo

* Fixed missing bracket

modules/sfm/CMakeLists.txt

@@ -9,17 +9,17 @@ find_package(Ceres QUIET)
 if(NOT Gflags_FOUND)  # Ceres find gflags on the own, so separate search isn't necessary
   find_package(Gflags QUIET)
 endif()
-if(NOT Glog_FOUND)  # Ceres find glog on the own, so separate search isn't necessary
+if(NOT (Glog_FOUND OR glog_FOUND))  # Ceres find glog on the own, so separate search isn't necessary
   find_package(Glog QUIET)
 endif()
 
-if(NOT Gflags_FOUND OR NOT Glog_FOUND)
+if(NOT Gflags_FOUND OR NOT (Glog_FOUND OR glog_FOUND))
   # try local search scripts
   list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
   if(NOT Gflags_FOUND)
     find_package(Gflags QUIET)
   endif()
-  if(NOT Glog_FOUND)
+  if(NOT (Glog_FOUND OR glog_FOUND))
     find_package(Glog QUIET)
   endif()
 endif()