Revert some changes in include directives and in CMakeLists.txt to mi…

…nimize the diff to melodic-devel

Addresses #1878 (review).

clients/roscpp/CMakeLists.txt

@@ -20,6 +20,8 @@ list(GET roscpp_VERSION_LIST 0 roscpp_VERSION_MAJOR)
 list(GET roscpp_VERSION_LIST 1 roscpp_VERSION_MINOR)
 list(GET roscpp_VERSION_LIST 2 roscpp_VERSION_PATCH)
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/ros/common.h.in ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros/common.h)
+
 find_package(Boost REQUIRED COMPONENTS chrono filesystem system)
 
 # Make sure we use CLOCK_MONOTONIC for the condition variable wait_for if not Apple.
@@ -34,8 +36,6 @@ if(NOT APPLE AND NOT WIN32)
   endif()
 endif()
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/ros/common.h.in ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros/common.h)
-
 include_directories(include ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 # this is needed for use within a bazel workspace. See #1548 for details.
 include_directories(${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION})

clients/roscpp/include/ros/callback_queue.h

@@ -37,6 +37,7 @@
 
 #include "ros/callback_queue_interface.h"
 #include "ros/time.h"
+#include "common.h"
 
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/condition_variable.hpp>

clients/roscpp/include/ros/rosout_appender.h

@@ -35,8 +35,8 @@
 #ifndef ROSCPP_ROSOUT_APPENDER_H
 #define ROSCPP_ROSOUT_APPENDER_H
 
-#include <ros/common.h>
 #include <ros/message_forward.h>
+#include "common.h"
 
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/condition_variable.hpp>

clients/roscpp/include/ros/service_server_link.h

@@ -35,7 +35,7 @@
 #ifndef ROSCPP_SERVICE_SERVER_LINK_H
 #define ROSCPP_SERVICE_SERVER_LINK_H
 
-#include <ros/common.h>
+#include "ros/common.h"
 
 #include <boost/thread/condition_variable.hpp>
 #include <boost/thread/mutex.hpp>