From aea0ee32de0c0054aaad3c1e3c678a6a4da475d3 Mon Sep 17 00:00:00 2001
From: idelpino <telecosg@gmail.com>
Date: Wed, 10 Apr 2024 17:47:38 +0200
Subject: [PATCH] Change kf_based_terrain_analysis dependency to make it local
using git submodules
---
CMakeLists.txt | 12 +++++++-----
include/ground_segmentation_alg.h | 3 ++-
include/ground_segmentation_alg_node.h | 3 ++-
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 895a37d..0f6a904 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(iri_ground_segmentation)
set(CMAKE_PREFIX_PATH
${CMAKE_PREFIX_PATH}
- $/usr/local/lib/iridrivers
+# $/usr/local/lib/iridrivers
)
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
@@ -38,7 +38,7 @@ find_package(catkin REQUIRED COMPONENTS iri_base_algorithm message_generation cv
# Add system and labrobotica dependencies here
# ********************************************************************
find_package(PCL REQUIRED COMPONENTS common filters)
-find_package(kf_based_terrain_analysis REQUIRED)
+#find_package(kf_based_terrain_analysis REQUIRED)
# ********************************************************************
@@ -92,7 +92,7 @@ catkin_package(
# ********************************************************************
# Add system and labrobotica run time dependencies here
# ********************************************************************
-# DEPENDS kf_based_terrain_analysis mhekf_tracking
+## DEPENDS kf_based_terrain_analysis mhekf_tracking
)
SET(CMAKE_CXX_STANDARD 11)
@@ -106,7 +106,7 @@ SET(CMAKE_CXX_STANDARD 11)
include_directories(include)
include_directories(${catkin_INCLUDE_DIRS})
include_directories(${PCL_INCLUDE_DIRS})
-include_directories(${kf_based_terrain_analysis_INCLUDE_DIRS})
+#include_directories(${kf_based_terrain_analysis_INCLUDE_DIRS})
# include_directories(${<dependency>_INCLUDE_DIR})
## Declare a cpp library
@@ -120,8 +120,10 @@ add_executable(${PROJECT_NAME} src/ground_segmentation_alg.cpp src/ground_segmen
# ********************************************************************
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
target_link_libraries(${PROJECT_NAME} ${PCL_LIBRARIES})
-target_link_libraries(${PROJECT_NAME} ${kf_based_terrain_analysis_LIBRARY})
+#target_link_libraries(${PROJECT_NAME} ${kf_based_terrain_analysis_LIBRARY})
# target_link_libraries(${PROJECT_NAME} ${<dependency>_LIBRARY})
+add_subdirectory(kf_based_terrain_analysis)
+target_link_libraries(${PROJECT_NAME} kf_based_terrain_analysis)
# ********************************************************************
# Add message headers dependencies
diff --git a/include/ground_segmentation_alg.h b/include/ground_segmentation_alg.h
index 332add5..1c3bc1b 100644
--- a/include/ground_segmentation_alg.h
+++ b/include/ground_segmentation_alg.h
@@ -27,7 +27,8 @@
#include <iri_ground_segmentation/GroundSegmentationConfig.h>
-#include <iridrivers/kf_based_terrain_analysis.h>
+//#include <iridrivers/kf_based_terrain_analysis.h>
+#include <../kf_based_terrain_analysis/include/kf_based_terrain_analysis.h>
#include <sensor_msgs/PointCloud2.h>
#include <pcl_conversions/pcl_conversions.h>
diff --git a/include/ground_segmentation_alg_node.h b/include/ground_segmentation_alg_node.h
index 66ce27b..3818fbf 100644
--- a/include/ground_segmentation_alg_node.h
+++ b/include/ground_segmentation_alg_node.h
@@ -26,7 +26,8 @@
#define _ground_segmentation_alg_node_h_
#include <iri_base_algorithm/iri_base_algorithm.h>
-#include <iridrivers/kf_based_terrain_analysis.h>
+//#include <iridrivers/kf_based_terrain_analysis.h>
+#include <../kf_based_terrain_analysis/include/kf_based_terrain_analysis.h>
// [publisher subscriber headers]
#include "ground_segmentation_alg.h"
--
GitLab