Update third-party: JLinkage and use FetchContent for it (#102)

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "third-party/Hierarchical-Localization"]
 	path = third-party/Hierarchical-Localization
 	url = https://github.com/cvg/Hierarchical-Localization.git
-[submodule "third-party/JLinkage"]
-	path = third-party/JLinkage
-	url = https://github.com/B1ueber2y/JLinkage
 [submodule "third-party/RansacLib"]
 	path = third-party/RansacLib
 	url = https://github.com/B1ueber2y/RansacLib.git

CMakeLists.txt

@@ -26,6 +26,7 @@ option(INTERPOLATION_ENABLED "Whether to enable interpolation-based pixel-perfec
 option(FETCH_POSELIB "Whether to use PoseLib with FetchContent or with self-installed software" ON)
 option(FETCH_COLMAP "Whether to use COLMAP with FetchContent or with self-installed software" ON)
 option(CUDA_ENABLED "Whether to use CUDA (only for the third-party COLMAP)" OFF)
+option(FETCH_JLINKAGE "Whether to use JLinkage with FetchContent or with self-installed software" ON)
 
 include(cmake/FindDependencies.cmake)
 include(cmake/InitVariables.cmake)
@@ -41,7 +42,6 @@ link_directories(${LIMAP_LINK_DIRS})
 
 # Add sources
 add_subdirectory(third-party)
-include_directories(${JLINKAGE_INCLUDE_DIRS})
 include_directories(${RANSACLIB_INCLUDE_DIRS})
 add_subdirectory(limap)
 

cmake/FindDependencies.cmake

@@ -67,3 +67,16 @@ else()
 endif()
 message(STATUS "Configuring COLMAP... done")
 
+# JLinkage
+FetchContent_Declare(JLinkage
+    GIT_REPOSITORY    https://github.com/B1ueber2y/JLinkage.git
+    GIT_TAG           452d67eda005db01a02071a5af8f0eced0a02079
+    EXCLUDE_FROM_ALL
+)
+message(STATUS "Configuring JLinkage...")
+if (FETCH_JLINKAGE)
+    FetchContent_MakeAvailable(JLinkage)
+else()
+    find_package(JLinkage REQUIRED)
+endif()
+message(STATUS "Configuring JLinkage... done")

cmake/InitVariables.cmake

@@ -25,11 +25,16 @@ else()
     list(APPEND LIMAP_EXTERNAL_LIBRARIES PoseLib)
 endif()
 
+if(NOT FETCH_JLINKAGE)
+    list(APPEND LIMAP_EXTERNAL_LIBRARIES JLinkage::JLinkage)
+else()
+    list(APPEND LIMAP_EXTERNAL_LIBRARIES JLinkage)
+endif()
+
 # Internal libraries
 set(LIMAP_INTERNAL_LIBRARIES
   HighFive
   pybind11::module
-  JLinkage
   igl::core
 )
 

limap/vplib/JLinkage/JLinkage.cc

@@ -1,7 +1,7 @@
 #include "vplib/JLinkage/JLinkage.h"
 
-#include <VPCluster.h>
-#include <VPSample.h>
+#include <JLinkage/include/VPCluster.h>
+#include <JLinkage/include/VPSample.h>
 #include <third-party/progressbar.hpp>
 
 namespace limap {

third-party/CMakeLists.txt

@@ -1,5 +1,4 @@
 add_subdirectory(HighFive)
 add_subdirectory(pybind11)
-add_subdirectory(JLinkage)
 add_subdirectory(libigl)
 add_subdirectory(RansacLib)