From 369411183dd4578e17421f2f2b915bbf609f38f6 Mon Sep 17 00:00:00 2001
From: Sebastian Hahta <joseha@utu.fi>
Date: Fri, 20 Mar 2020 10:48:12 +0200
Subject: [PATCH] use lib/libsgm
---
CMakeLists.txt | 10 +++++-----
lib/libsgm/CMakeLists.txt | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 376b06b36..92dfd40bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,10 +116,10 @@ endif()
# ==============================================================================
if (WITH_FIXSTARS)
- find_package(LibSGM REQUIRED)
- if (LibSGM_FOUND)
- set(HAVE_LIBSGM true)
- endif()
+ set(HAVE_LIBSGM true)
+ add_subdirectory(lib/libsgm)
+ include_directories(lib/libsgm/include)
+ set_property(TARGET sgm PROPERTY FOLDER "dependencies")
endif()
if (WITH_CERES)
@@ -400,7 +400,7 @@ if (BUILD_CALIBRATION)
if (NOT HAVE_CERES)
message(ERROR "Ceres is required")
endif()
-
+
add_subdirectory(applications/calibration-ceres)
add_subdirectory(applications/calibration-multi)
endif()
diff --git a/lib/libsgm/CMakeLists.txt b/lib/libsgm/CMakeLists.txt
index 22f6e557c..497411f85 100644
--- a/lib/libsgm/CMakeLists.txt
+++ b/lib/libsgm/CMakeLists.txt
@@ -26,8 +26,8 @@ if(BUILD_OPENCV_WRAPPER)
include_directories(${OpenCV_INCLUDE_DIRS})
endif()
-configure_file(${CMAKE_SOURCE_DIR}/include/libsgm_config.h.in
- ${CMAKE_SOURCE_DIR}/include/libsgm_config.h
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/libsgm_config.h.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/include/libsgm_config.h
)
add_subdirectory(src)
--
GitLab