Merge pull request #994 from alicevision/cmake/opengvModern

[cmake] Use modern cmake to manage OpenGV
alicevision · Feb 24, 2021 · 47fef5a · 47fef5a
2 parents 5335754 + f23f179
commit 47fef5a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 76 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -620,20 +620,15 @@ set(ALICEVISION_HAVE_OPENGV 0)
 
 if(ALICEVISION_BUILD_SFM)
   if(NOT ALICEVISION_USE_OPENGV STREQUAL "OFF")
-    find_package(OpenGV)
-
-    if(OPENGV_FOUND)
+    find_package(opengv 1.0 CONFIG)
+    if(opengv_FOUND)
       set(ALICEVISION_HAVE_OPENGV 1)
-      message(STATUS "OpenGV found.")
+      message(STATUS "OpenGV ${opengv_VERSION} found.")
     elseif(ALICEVISION_USE_OPENGV STREQUAL "ON")
       message(SEND_ERROR "Failed to find OpenGV.")
     endif()
   endif()
 
-  if(ALICEVISION_HAVE_OPENGV)
-    include_directories(${OPENGV_INCLUDE_DIR})
-    link_directories(${OPENGV_LIBRARY_DIR})
-  endif()
 endif()
 
 # ==============================================================================

diff --git a/src/aliceVision/localization/CMakeLists.txt b/src/aliceVision/localization/CMakeLists.txt
@@ -45,7 +45,7 @@ if(ALICEVISION_HAVE_CCTAG)
 endif()
 
 if(ALICEVISION_HAVE_OPENGV)
-  target_link_libraries(aliceVision_localization PRIVATE ${OPENGV_LIBRARY})
+  target_link_libraries(aliceVision_localization PRIVATE opengv)
 endif()
 
 # Unit tests

diff --git a/src/cmake/AliceVisionConfig.cmake.in b/src/cmake/AliceVisionConfig.cmake.in
@@ -55,13 +55,20 @@ if(ALICEVISION_HAVE_CCTAG)
   find_dependency(CCTag 1.0.0)
 endif()
 
-# whether it is built with CCTags
+# whether it is built with Popsift
 set(ALICEVISION_HAVE_POPSIFT @ALICEVISION_HAVE_POPSIFT@)
 
 if(ALICEVISION_HAVE_POPSIFT)
   find_dependency(PopSift 1.0.0)
 endif()
 
+# whether it is built with OpenGV
+set(ALICEVISION_HAVE_OPENGV @ALICEVISION_HAVE_OPENGV@)
+
+if(ALICEVISION_HAVE_OPENGV)
+  find_dependency(opengv 1.0)
+endif()
+
 # whether it is built with OpenCV
 set(ALICEVISION_HAVE_OPENCV @ALICEVISION_HAVE_OPENCV@)
 

diff --git a/src/cmake/FindOpenGV.cmake b/src/cmake/FindOpenGV.cmake