Merge pull request #52 from christian-rauch/gtsam

use the GTSAM system package

Author: koide3

CMakeLists.txt

@@ -30,6 +30,7 @@ endif()
 
 find_package(Boost REQUIRED COMPONENTS filesystem)
 find_package(GTSAM REQUIRED)
+find_package(GTSAM_UNSTABLE REQUIRED)
 find_package(Eigen3 REQUIRED)
 
 if(BUILD_WITH_TBB)
@@ -191,7 +192,8 @@ target_link_libraries(gtsam_points
   Boost::boost
   Boost::filesystem
   Eigen3::Eigen
-  GTSAM::GTSAM
+  gtsam
+  gtsam_unstable
   $<TARGET_NAME_IF_EXISTS:TBB::tbb>
   $<TARGET_NAME_IF_EXISTS:OpenMP::OpenMP_CXX>
 )
@@ -237,7 +239,8 @@ if(BUILD_WITH_CUDA)
     CUDA::cudart
     Boost::boost
     Eigen3::Eigen
-    GTSAM::GTSAM
+    gtsam
+    gtsam_unstable
     $<TARGET_NAME_IF_EXISTS:TBB::tbb>
     $<TARGET_NAME_IF_EXISTS:OpenMP::OpenMP_CXX>
   )
@@ -249,7 +252,7 @@ endif()
 
 #Demo
 if(BUILD_DEMO)
-  find_package(Iridescence REQUIRED)
+  find_package(iridescence REQUIRED)
 
   file(GLOB demo_sources "src/demo/*.cpp")
   foreach(demo_src IN LISTS demo_sources)
@@ -356,7 +359,6 @@ write_basic_package_version_file(
 install(FILES
   "${CMAKE_CURRENT_BINARY_DIR}/gtsam_points-config.cmake"
   "${CMAKE_CURRENT_BINARY_DIR}/gtsam_points-config-version.cmake"
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindGTSAM.cmake"
   DESTINATION ${CMAKE_CONFIG_INSTALL_DIR}
 )
 

cmake/FindGTSAM.cmake

@@ -19,9 +19,14 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${gtsam_points_CURRENT_CONFIG_DIR}")
 include(CMakeFindDependencyMacro)
 find_dependency(Eigen3 REQUIRED)
 find_dependency(GTSAM REQUIRED)
+find_dependency(GTSAM_UNSTABLE REQUIRED)
 find_dependency(OpenMP REQUIRED)
 find_dependency(Boost REQUIRED COMPONENTS filesystem)
 
+if(GTSAM_POINTS_USE_TBB)
+  find_dependency(TBB REQUIRED)
+endif()
+
 if(BUILD_WITH_CUDA)
   find_dependency(CUDAToolkit REQUIRED)
 endif()