From 9a4153babbd14d8a878e5eb8494fad65608a8962 Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Tue, 12 Jan 2021 18:12:52 +0100
Subject: [PATCH] some required changes for noetic
---
CMakeLists.txt | 5 +++--
src/GazeboZoneSpawner.cpp | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27848b9..2336e95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0.2)
project(simulation_util)
# Compile as C++14
-add_compile_options(-std=c++14)
+add_compile_options(-std=c++17)
## Find catkin macros and libraries
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
@@ -120,8 +120,9 @@ catkin_package(
## Your package locations should be listed before other locations
include_directories(
include
+ /usr/include/sdformat-9.2
+ /usr/include/ignition/math6
${catkin_INCLUDE_DIRS}
- ${SDFormat_INCLUDE_DIRS}
)
## Declare a C++ library
diff --git a/src/GazeboZoneSpawner.cpp b/src/GazeboZoneSpawner.cpp
index 378c9f3..304b529 100644
--- a/src/GazeboZoneSpawner.cpp
+++ b/src/GazeboZoneSpawner.cpp
@@ -6,7 +6,7 @@
#include "GazeboZoneSpawner.h"
-#include <sdformat-6.0/sdf/sdf.hh> // for sdf model parsing
+#include <sdf/sdf.hh> // for sdf model parsing
#include <gazebo_msgs/SpawnModel.h> // service definition for spawning things in gazebo
#include <ros/ros.h>
#include <ros/package.h>
@@ -142,4 +142,4 @@ void GazeboZoneSpawner::spawnPrimitive(const std::string &name, shape_msgs::Soli
} else {
ROS_ERROR("Failed to call service '/gazebo/spawn_sdf_model'");
}
-}
\ No newline at end of file
+}
--
GitLab