diff --git a/Findautonomous_driving_tools.cmake b/Findautonomous_driving_tools.cmake index 1cefbfc6b3bd0f33f0ba9ec1f75227f5c6d1e71f..1198fe103c70f8f0f1b9e8157b1beeaad90b241e 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 6296d80e0212118fb13e62421bc14e6b792f8624..dc264cfd483e15481f1caf3167bc8acdb1e004c4 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 dd94799e7cc2f7eb762a83bb3a3db13dfbab345b..5c65a9eeed7265309abe14d807199a7b8016e668 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 816fae661baba4157b0cceb9b3afa08c3da463da..930ed4dd11c142669308113ef0a7df510057dce9 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 76dc3625ca28a5b00365b23061822e4171b464d0..0d69905524c5bd9ddf948e5583fa9ab11dc496e7 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 dea83187cdfdd10678cfb3ade2d830914fec6e4e..df959debd5ff491496ec3adbad618957a1206d81 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 c6eb6ac5ad6452ae45d9eac253f77f8249624c09..b584288126167c5b52f30a06c9c342d218d19f69 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})