Merge pull request #2928 from alalek:cmake_handle_glog_target

Author: alalek

modules/sfm/CMakeLists.txt

@@ -27,9 +27,15 @@ endif()
 if(NOT DEFINED GFLAGS_INCLUDE_DIRS AND DEFINED GFLAGS_INCLUDE_DIR)
   set(GFLAGS_INCLUDE_DIRS "${GFLAGS_INCLUDE_DIR}")
 endif()
+if(NOT GFLAGS_LIBRARIES AND TARGET gflags::gflags)
+  set(GFLAGS_LIBRARIES gflags::gflags)
+endif()
 if(NOT DEFINED GLOG_INCLUDE_DIRS AND DEFINED GLOG_INCLUDE_DIR)
   set(GLOG_INCLUDE_DIRS "${GLOG_INCLUDE_DIR}")
 endif()
+if(NOT GLOG_LIBRARIES AND TARGET glog::glog)
+  set(GLOG_LIBRARIES glog::glog)
+endif()
 
 if((gflags_FOUND OR Gflags_FOUND OR GFLAGS_FOUND OR GFLAGS_INCLUDE_DIRS) AND (glog_FOUND OR Glog_FOUND OR GLOG_FOUND OR GLOG_INCLUDE_DIRS))
   set(__cache_key "${GLOG_INCLUDE_DIRS} ~ ${GFLAGS_INCLUDE_DIRS} ~ ${GLOG_LIBRARIES} ~ ${GFLAGS_LIBRARIES}")

modules/sfm/src/libmv_light/libmv/correspondence/CMakeLists.txt

@@ -8,7 +8,7 @@ FILE(GLOB CORRESPONDENCE_HDRS *.h)
 
 ADD_LIBRARY(correspondence STATIC ${CORRESPONDENCE_SRC} ${CORRESPONDENCE_HDRS})
 
-TARGET_LINK_LIBRARIES(correspondence LINK_PRIVATE ${GLOG_LIBRARY} multiview)
+TARGET_LINK_LIBRARIES(correspondence LINK_PRIVATE ${GLOG_LIBRARIES} multiview)
 IF(TARGET Eigen3::Eigen)
   TARGET_LINK_LIBRARIES(correspondence LINK_PUBLIC Eigen3::Eigen)
 ENDIF()

modules/sfm/src/libmv_light/libmv/multiview/CMakeLists.txt

@@ -17,7 +17,7 @@ SET(MULTIVIEW_SRC conditioning.cc
 FILE(GLOB MULTIVIEW_HDRS *.h)
 
 ADD_LIBRARY(multiview STATIC ${MULTIVIEW_SRC} ${MULTIVIEW_HDRS})
-TARGET_LINK_LIBRARIES(multiview LINK_PRIVATE ${GLOG_LIBRARY} numeric)
+TARGET_LINK_LIBRARIES(multiview LINK_PRIVATE ${GLOG_LIBRARIES} numeric)
 IF(TARGET Eigen3::Eigen)
   TARGET_LINK_LIBRARIES(multiview LINK_PUBLIC Eigen3::Eigen)
 ENDIF()