From 11cda6f8c7b29a13f3b2904c98045f805f22f2db Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Sat, 17 Apr 2021 09:39:00 +0000 Subject: [PATCH] cmake: fix handling of glog/gflags --- modules/sfm/CMakeLists.txt | 6 ++++++ .../sfm/src/libmv_light/libmv/correspondence/CMakeLists.txt | 2 +- modules/sfm/src/libmv_light/libmv/multiview/CMakeLists.txt | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/sfm/CMakeLists.txt b/modules/sfm/CMakeLists.txt index 045a1fe6e..22ff5c426 100644 --- a/modules/sfm/CMakeLists.txt +++ b/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}") diff --git a/modules/sfm/src/libmv_light/libmv/correspondence/CMakeLists.txt b/modules/sfm/src/libmv_light/libmv/correspondence/CMakeLists.txt index eef1f243c..95dbebe44 100644 --- a/modules/sfm/src/libmv_light/libmv/correspondence/CMakeLists.txt +++ b/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() diff --git a/modules/sfm/src/libmv_light/libmv/multiview/CMakeLists.txt b/modules/sfm/src/libmv_light/libmv/multiview/CMakeLists.txt index 14c77fe57..ece117590 100644 --- a/modules/sfm/src/libmv_light/libmv/multiview/CMakeLists.txt +++ b/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()