Skip to content
Snippets Groups Projects
Commit 9a4153ba authored by Johannes Mey's avatar Johannes Mey
Browse files

some required changes for noetic

parent 2b1b5011
Branches
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0.2) ...@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0.2)
project(simulation_util) project(simulation_util)
# Compile as C++14 # Compile as C++14
add_compile_options(-std=c++14) add_compile_options(-std=c++17)
## Find catkin macros and libraries ## Find catkin macros and libraries
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
...@@ -120,8 +120,9 @@ catkin_package( ...@@ -120,8 +120,9 @@ catkin_package(
## Your package locations should be listed before other locations ## Your package locations should be listed before other locations
include_directories( include_directories(
include include
/usr/include/sdformat-9.2
/usr/include/ignition/math6
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
${SDFormat_INCLUDE_DIRS}
) )
## Declare a C++ library ## Declare a C++ library
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "GazeboZoneSpawner.h" #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 <gazebo_msgs/SpawnModel.h> // service definition for spawning things in gazebo
#include <ros/ros.h> #include <ros/ros.h>
#include <ros/package.h> #include <ros/package.h>
...@@ -142,4 +142,4 @@ void GazeboZoneSpawner::spawnPrimitive(const std::string &name, shape_msgs::Soli ...@@ -142,4 +142,4 @@ void GazeboZoneSpawner::spawnPrimitive(const std::string &name, shape_msgs::Soli
} else { } else {
ROS_ERROR("Failed to call service '/gazebo/spawn_sdf_model'"); ROS_ERROR("Failed to call service '/gazebo/spawn_sdf_model'");
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment