From 7146700e5c307fccb42375847fbfcc837b3cccba Mon Sep 17 00:00:00 2001
From: Sergi Hernandez Juan <shernand@iri.upc.edu>
Date: Sat, 2 Jan 2021 12:59:22 +0100
Subject: [PATCH] Removed the local path of the opendrive specification header
file. Added the path to the Find cmake file and CMakeLists.txt files.
---
Findautonomous_driving_tools.cmake | 2 ++
include/opendrive_geometry.h | 2 +-
include/opendrive_lane.h | 2 +-
include/opendrive_object.h | 2 +-
include/opendrive_road_segment.h | 2 +-
include/opendrive_signal.h | 2 +-
src/CMakeLists.txt | 1 +
7 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Findautonomous_driving_tools.cmake b/Findautonomous_driving_tools.cmake
index 1cefbfc..1198fe1 100644
--- a/Findautonomous_driving_tools.cmake
+++ b/Findautonomous_driving_tools.cmake
@@ -2,6 +2,8 @@
SET(name autonomous_driving_tools)
FIND_PATH(${name}_INCLUDE_DIRS gradient.h g2_spline.h dijkstra.h /usr/local/include/iri/${name} /usr/include/iri/${name})
+SET(${name}_INCLUDE_DIRS ${${name}_INCLUDE_DIRS} ${${name}_INCLUDE_DIRS}/xml)
+
FIND_LIBRARY(${name}_LIBRARIES
NAMES ${name}
PATHS /usr/local/lib/iri/${name} /usr/lib/iri/${name})
diff --git a/include/opendrive_geometry.h b/include/opendrive_geometry.h
index 6296d80..dc264cf 100644
--- a/include/opendrive_geometry.h
+++ b/include/opendrive_geometry.h
@@ -3,7 +3,7 @@
#include "opendrive_common.h"
#ifdef _HAVE_XSD
-#include "../src/xml/OpenDRIVE_1.4H.hxx"
+#include "xml/OpenDRIVE_1.4H.hxx"
#endif
#include <iostream>
diff --git a/include/opendrive_lane.h b/include/opendrive_lane.h
index dd94799..5c65a9e 100644
--- a/include/opendrive_lane.h
+++ b/include/opendrive_lane.h
@@ -2,7 +2,7 @@
#define _OPENDRIVE_LANE_H
#ifdef _HAVE_XSD
-#include "../src/xml/OpenDRIVE_1.4H.hxx"
+#include "xml/OpenDRIVE_1.4H.hxx"
#endif
#include "opendrive_road_node.h"
diff --git a/include/opendrive_object.h b/include/opendrive_object.h
index 816fae6..930ed4d 100644
--- a/include/opendrive_object.h
+++ b/include/opendrive_object.h
@@ -4,7 +4,7 @@
#include "opendrive_common.h"
#include "opendrive_road_segment.h"
#ifdef _HAVE_XSD
-#include "../src/xml/OpenDRIVE_1.4H.hxx"
+#include "xml/OpenDRIVE_1.4H.hxx"
#endif
#define OD_MAX_VERTICES 32
diff --git a/include/opendrive_road_segment.h b/include/opendrive_road_segment.h
index 76dc362..0d69905 100644
--- a/include/opendrive_road_segment.h
+++ b/include/opendrive_road_segment.h
@@ -2,7 +2,7 @@
#define _OPENDRIVE_ROAD_SEGMENT_H
#ifdef _HAVE_XSD
-#include "../src/xml/OpenDRIVE_1.4H.hxx"
+#include "xml/OpenDRIVE_1.4H.hxx"
#endif
#include "opendrive_lane.h"
diff --git a/include/opendrive_signal.h b/include/opendrive_signal.h
index dea8318..df959de 100644
--- a/include/opendrive_signal.h
+++ b/include/opendrive_signal.h
@@ -4,7 +4,7 @@
#include "opendrive_common.h"
#include "opendrive_road_segment.h"
#ifdef _HAVE_XSD
-#include "../src/xml/OpenDRIVE_1.4H.hxx"
+#include "xml/OpenDRIVE_1.4H.hxx"
#endif
class COpendriveRoadSegment;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c6eb6ac..b584288 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,6 +12,7 @@ ADD_SUBDIRECTORY(xml)
# add the necessary include directories
INCLUDE_DIRECTORIES(../include)
+INCLUDE_DIRECTORIES(./)
INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIR})
--
GitLab