Export platform build flags to dependent catkin projects

Author: jdlangs

industrial_robot_client/CMakeLists.txt

@@ -8,10 +8,6 @@ find_package(catkin REQUIRED COMPONENTS roscpp std_msgs sensor_msgs
 
 find_package(Boost REQUIRED COMPONENTS system thread)
 
-# The definition is copied from the CMakeList for the simple_message package.
-add_definitions(-DROS=1)           #build using ROS libraries
-add_definitions(-DLINUXSOCKETS=1)  #build using LINUX SOCKETS libraries
-
 set(SRC_FILES src/joint_relay_handler.cpp
               src/robot_status_relay_handler.cpp
               src/joint_trajectory_downloader.cpp
@@ -31,7 +27,6 @@ catkin_package(
       industrial_utils
     INCLUDE_DIRS include
     LIBRARIES ${PROJECT_NAME}_dummy
-    CFG_EXTRAS issue46_workaround.cmake
 )
 
 

simple_message/CMakeLists.txt

@@ -9,11 +9,11 @@ set(ROS_BUILD_STATIC_LIBS true)
 set(ROS_BUILD_SHARED_LIBS false)
 
 # The simple_message library is designed to cross compile on Ubuntu
-# and various robot controllers.  This requires conditionally compiling
-# certain functions and headers.  The definition below enables compiling
-# for a ROS node.
-add_definitions(-DROS=1)           #build using ROS libraries
-add_definitions(-DLINUXSOCKETS=1)  #use linux sockets for communication
+# and various robot controllers. This requires conditionally compiling
+# certain functions and headers. The default flags in the file included
+# here enable compiling for a ROS node. This file is also exported to
+# dependent packages via the `catkin_package` commmand.
+include(cmake/platform_build_flags.cmake)
 
 set(SRC_FILES src/byte_array.cpp
 	src/simple_message.cpp
@@ -71,7 +71,7 @@ catkin_package(
     CATKIN_DEPENDS roscpp industrial_msgs
     INCLUDE_DIRS include
     LIBRARIES ${PROJECT_NAME}_dummy
-    CFG_EXTRAS issue46_workaround.cmake
+    CFG_EXTRAS platform_build_flags.cmake issue46_workaround.cmake
 )
 
 

simple_message/cmake/platform_build_flags.cmake

@@ -0,0 +1,11 @@
+# Flags that control the conditional compilation of this library for use on different platforms. The
+# defaults set here will be exported to dependent projects via catkin. Dependent projects can use
+# cmake's `remove_definitions` command to change these defaults if desired.
+
+#Include code that interfaces with ROS
+add_definitions(-DROS)
+
+#Control which platform's underlying networking library is used by this package.
+#The package will not build unless one (and only one) of these definitions is set.
+add_definitions(-DLINUX_SOCKETS)
+#add_definitions(-DMOTOPLUS)

simple_message/include/simple_message/socket/simple_socket.h

@@ -42,7 +42,7 @@
 #include "smpl_msg_connection.h"
 #endif
 
-#ifdef LINUXSOCKETS
+#ifdef LINUX_SOCKETS
 
 #include "sys/socket.h"
 #include "arpa/inet.h"

simple_message/include/simple_message/socket/tcp_socket.h

@@ -40,7 +40,7 @@
 #include "shared_types.h"
 #endif
 
-#ifdef LINUXSOCKETS
+#ifdef LINUX_SOCKETS
 #include "sys/socket.h"
 #include "netdb.h"
 #include "arpa/inet.h"

simple_message/include/simple_message/socket/udp_socket.h

@@ -42,7 +42,7 @@
 #include "smpl_msg_connection.h"
 #endif
 
-#ifdef LINUXSOCKETS
+#ifdef LINUX_SOCKETS
 #include "sys/socket.h"
 #include "arpa/inet.h"
 #include "string.h"