From b562ab4af169060d0c67c3db6bb95a4ca25a4d4c Mon Sep 17 00:00:00 2001
From: Tommy Persson <tommy.persson@liu.se>
Date: Mon, 1 Oct 2018 15:08:07 +0200
Subject: [PATCH] Fix for bouncy
---
CMakeLists.txt | 24 ++++++++++++++++++------
package.xml | 3 ++-
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4287614..7b08d68 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,19 +2,31 @@ cmake_minimum_required(VERSION 3.5)
project(geographic_msgs)
-#if(NOT WIN32)
-# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra")
-#endif()
+# Default to C++14
+if(NOT CMAKE_CXX_STANDARD)
+ set(CMAKE_CXX_STANDARD 14)
+endif()
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ # we dont use add_compile_options with pedantic in message packages
+ # because the Python C extensions dont comply with it
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic")
+endif()
find_package(ament_cmake REQUIRED)
-find_package(builtin_interfaces REQUIRED)
find_package(rosidl_default_generators REQUIRED)
find_package(geometry_msgs REQUIRED)
-rosidl_generate_interfaces(geographic_msgs
+set(msg_files
"msg/GeoPose.msg"
"msg/GeoPoint.msg"
- DEPENDENCIES builtin_interfaces geometry_msgs
)
+rosidl_generate_interfaces(${PROJECT_NAME}
+ ${msg_files}
+ DEPENDENCIES geometry_msgs
+ ADD_LINTER_TESTS
+)
+
+ament_export_dependencies(rosidl_default_runtime)
+
ament_package()
diff --git a/package.xml b/package.xml
index 2be70b2..f0965c1 100644
--- a/package.xml
+++ b/package.xml
@@ -14,7 +14,8 @@
<build_depend>std_msgs</build_depend>
<exec_depend>rosidl_default_runtime</exec_depend>
- <exec_depend>std_msgs</exec_depend>
+
+ <depend>geometry_msgs</depend>
<test_depend>ament_lint_common</test_depend>
--
GitLab