Release v0.0.1-alpha (#5)

* Refs #3711 - Fix dependency bug. Now type_support_C do not depend on type_support_Cpp. * Fixed lint_cmake space issue. (#2) * Fixed lint_cmake space issue. (#4) * linker issue solved. (#3) * linker issue solved. * Changes made according to discussion
micro-ROS · Nov 17, 2018 · 75a4550 · 75a4550
1 parent 9d45272
commit 75a4550
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 61 deletions.
diff --git a/rosidl_typesupport_microxrcedds_c/CMakeLists.txt b/rosidl_typesupport_microxrcedds_c/CMakeLists.txt
@@ -28,11 +28,9 @@ find_package(MicroXRCEDDS REQUIRED MODULE)
 find_package(ament_cmake_python REQUIRED)
 
 ament_export_dependencies(rosidl_typesupport_microxrcedds_shared)
-ament_export_dependencies(rmw)
 ament_export_dependencies(rosidl_cmake)
 ament_export_dependencies(rosidl_generator_c)
 ament_export_dependencies(microcdr)
-ament_export_dependencies(rosidl_generator_dds_idl)
 
 ament_export_include_directories(include)
 

diff --git a/...esupport_microxrcedds_c/cmake/rosidl_typesupport_microxrcedds_c_generate_interfaces.cmake b/...esupport_microxrcedds_c/cmake/rosidl_typesupport_microxrcedds_c_generate_interfaces.cmake
@@ -130,9 +130,6 @@ configure_file(
 set(_target_suffix "__rosidl_typesupport_microxrcedds_c")
 
 
-# link_directories(${microxrcedds_LIBRARY_DIRS})
-
-
 # generate Micro XRCE-DDS typesupport shared library
 add_library(${rosidl_generate_interfaces_TARGET}${_target_suffix}
     ${_generated_msg_files} ${_generated_srv_files})
@@ -187,36 +184,26 @@ endforeach()
 
 # set ament depencencies
 ament_target_dependencies(${rosidl_generate_interfaces_TARGET}${_target_suffix}
-  "microxrcedds_client"
   "rosidl_typesupport_microxrcedds_c"
   "rosidl_typesupport_interface"
   "rosidl_typesupport_microxrcedds_shared"
   "${PROJECT_NAME}__rosidl_typesupport_microxrcedds_c")
 
+  ament_export_libraries(rosidl_typesupport_microxrcedds_c)
 
 # link libraries
-target_link_libraries(${rosidl_generate_interfaces_TARGET}${_target_suffix} microxrcedds_client microcdr)
-target_link_libraries(${rosidl_generate_interfaces_TARGET}${_target_suffix}
-  ${rosidl_generate_interfaces_TARGET}__rosidl_generator_c)
+target_link_libraries(
+  ${rosidl_generate_interfaces_TARGET}${_target_suffix}
+  microcdr
+  ${rosidl_generate_interfaces_TARGET}__rosidl_generator_c
+)
 
 
 # add dependencies
 add_dependencies(
   ${rosidl_generate_interfaces_TARGET}
   ${rosidl_generate_interfaces_TARGET}${_target_suffix}
 )
-#add_dependencies(
-#  ${rosidl_generate_interfaces_TARGET}${_target_suffix}
-#  ${rosidl_generate_interfaces_TARGET}__c
-#)
-#add_dependencies(
-#  ${rosidl_generate_interfaces_TARGET}${_target_suffix}
-#  ${rosidl_generate_interfaces_TARGET}__rosidl_typesupport_microxrcedds_c
-#)
-#add_dependencies(
-#  ${rosidl_generate_interfaces_TARGET}${_target_suffix}
-#  ${rosidl_generate_interfaces_TARGET}__c
-#)
 
 
 # install

diff --git a/...ort_microxrcedds_c/include/rosidl_typesupport_microxrcedds_c/deserialize_buffer_utility.h b/...ort_microxrcedds_c/include/rosidl_typesupport_microxrcedds_c/deserialize_buffer_utility.h
@@ -18,7 +18,9 @@
 
 #include <stddef.h>
 
+#include "rosidl_typesupport_microxrcedds_c/visibility_control.h"
 
+ROSIDL_TYPESUPPORT_MICROXRCEDDS_C_PUBLIC
 void rosidl_typesupport_microxrcedds_c__align_pointer(uint8_t ** intput_pointer, size_t * mem_size);
 
 #endif  // ROSIDL_TYPESUPPORT_MICROXRCEDDS_C__DESERIALIZE_BUFFER_UTILITY_H_
diff --git a/rosidl_typesupport_microxrcedds_c/package.xml b/rosidl_typesupport_microxrcedds_c/package.xml
@@ -13,16 +13,12 @@
   <buildtool_depend>rosidl_typesupport_microxrcedds_shared</buildtool_depend>
   <buildtool_depend>rosidl_cmake</buildtool_depend>
   <buildtool_depend>rosidl_generator_c</buildtool_depend>
-  <buildtool_depend>rosidl_generator_dds_idl</buildtool_depend>
 
   <buildtool_export_depend>ament_cmake</buildtool_export_depend>
   <buildtool_export_depend>microxrcedds_cmake_module</buildtool_export_depend>
   <buildtool_export_depend>rosidl_typesupport_microxrcedds_shared</buildtool_export_depend>
   <buildtool_export_depend>rosidl_cmake</buildtool_export_depend>
   <buildtool_export_depend>rosidl_generator_c</buildtool_export_depend>
-  <buildtool_export_depend>rosidl_generator_dds_idl</buildtool_export_depend> 
-
-  <build_export_depend>rmw</build_export_depend>
 
   <exec_depend>rosidl_parser</exec_depend>
   <exec_depend>rosidl_typesupport_interface</exec_depend>

diff --git a/rosidl_typesupport_microxrcedds_c/rosidl_typesupport_microxrcedds_c-extras.cmake.in b/rosidl_typesupport_microxrcedds_c/rosidl_typesupport_microxrcedds_c-extras.cmake.in
@@ -5,6 +5,9 @@
 find_package(microxrcedds_cmake_module REQUIRED)
 find_package(MicroXRCEDDS REQUIRED MODULE)
 
+# specific order: dependents before dependencies
+list(APPEND rosidl_typesupport_microxrcedds_c_LIBRARIES microcdr)
+
 if(NOT microxrcedds_client_FOUND)
   message(STATUS
     "Could not find eProsima Micro XRCE-DDS:

diff --git a/rosidl_typesupport_microxrcedds_c/src/deserialize_buffer_utility.c b/rosidl_typesupport_microxrcedds_c/src/deserialize_buffer_utility.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <rosidl_typesupport_microxrcedds_c/deserialize_buffer_utility.h>
 
 void rosidl_typesupport_microxrcedds_c__align_pointer(
   uint8_t ** pointer_to_align,

diff --git a/rosidl_typesupport_microxrcedds_c_tests/CMakeLists.txt b/rosidl_typesupport_microxrcedds_c_tests/CMakeLists.txt
@@ -15,7 +15,8 @@ endif()
 
 find_package(ament_cmake REQUIRED)
 
-
+find_package(rosidl_typesupport_microxrcedds_c QUIET)
+if(rosidl_typesupport_microxrcedds_c_FOUND)
 if(BUILD_TESTING)
   find_package(ament_lint_auto REQUIRED)
   ament_lint_auto_find_test_dependencies()
@@ -46,7 +47,7 @@ if(BUILD_TESTING)
 
 
 endif()
-
+endif()
 
 
 ament_package()
diff --git a/rosidl_typesupport_microxrcedds_cpp/CMakeLists.txt b/rosidl_typesupport_microxrcedds_cpp/CMakeLists.txt
@@ -21,27 +21,23 @@ endif()
 
 find_package(ament_cmake REQUIRED)
 
-find_package(microxrcedds_cmake_module QUIET)
-find_package(microcdr REQUIRED CONFIG)
-find_package(microxrcedds_client REQUIRED CONFIG)
 find_package(rosidl_typesupport_microxrcedds_shared REQUIRED CONFIG)
+find_package(microxrcedds_cmake_module QUIET)
 find_package(MicroXRCEDDS REQUIRED MODULE)
 
 find_package(ament_cmake_python REQUIRED)
 
-ament_export_dependencies(microxrcedds_client)
-ament_export_dependencies(rmw)
 ament_export_dependencies(rosidl_cmake)
 ament_export_dependencies(rosidl_generator_c)
 ament_export_dependencies(rosidl_generator_cpp)
-ament_export_dependencies(rosidl_generator_dds_idl)
+ament_export_dependencies(microcdr)
 
 ament_export_include_directories(include)
 
 ament_python_install_package(${PROJECT_NAME})
 
-
 add_library(${PROJECT_NAME} src/identifier.cpp)
+ament_export_libraries(${PROJECT_NAME})
 
 ament_target_dependencies(
   ${PROJECT_NAME}

diff --git a/...port_microxrcedds_cpp/cmake/rosidl_typesupport_microxrcedds_cpp_generate_interfaces.cmake b/...port_microxrcedds_cpp/cmake/rosidl_typesupport_microxrcedds_cpp_generate_interfaces.cmake
@@ -12,9 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#find_package(microxrcedds_client_cmake_module QUIET)
-find_package(microcdr REQUIRED CONFIG)
-find_package(microxrcedds_client REQUIRED CONFIG)
+find_package(microxrcedds_cmake_module REQUIRED)
+find_package(MicroXRCEDDS REQUIRED MODULE)
 find_package(rosidl_typesupport_microxrcedds_shared REQUIRED CONFIG)
 
 
@@ -131,8 +130,6 @@ configure_file(
 set(_target_suffix "__rosidl_typesupport_microxrcedds_cpp")
 
 
-# link_directories(${microxrcedds_LIBRARY_DIRS})
-
 
 # generate microxrcedds typesupport shared library
 add_library(${rosidl_generate_interfaces_TARGET}${_target_suffix}
@@ -189,16 +186,17 @@ endforeach()
 
 # set ament depencencies
 ament_target_dependencies(${rosidl_generate_interfaces_TARGET}${_target_suffix}
-  "microxrcedds_client"
   "rosidl_typesupport_microxrcedds_cpp"
   "rosidl_typesupport_interface"
   "rosidl_typesupport_microxrcedds_shared"
   "${PROJECT_NAME}__rosidl_typesupport_microxrcedds_cpp")
 
-
 # link libraries
-target_link_libraries(${rosidl_generate_interfaces_TARGET}${_target_suffix} microxrcedds_client microcdr)
-target_link_libraries(${rosidl_generate_interfaces_TARGET}${_target_suffix} ${rosidl_generate_interfaces_TARGET}__rosidl_generator_c)
+target_link_libraries(
+  ${rosidl_generate_interfaces_TARGET}${_target_suffix}
+  ${rosidl_generate_interfaces_TARGET}__rosidl_generator_c
+  microcdr
+)
 
 
 # add dependencies
@@ -210,14 +208,6 @@ add_dependencies(
   ${rosidl_generate_interfaces_TARGET}${_target_suffix}
   ${rosidl_generate_interfaces_TARGET}__cpp
 )
-#add_dependencies(
-#  ${rosidl_generate_interfaces_TARGET}${_target_suffix}
-#  ${rosidl_generate_interfaces_TARGET}__rosidl_typesupport_microxrcedds_cpp
-#)
-#add_dependencies(
-#  ${rosidl_generate_interfaces_TARGET}${_target_suffix}
-#  ${rosidl_generate_interfaces_TARGET}__c
-#)
 
 
 # install

diff --git a/rosidl_typesupport_microxrcedds_cpp/package.xml b/rosidl_typesupport_microxrcedds_cpp/package.xml
@@ -13,17 +13,13 @@
   <buildtool_depend>rosidl_cmake</buildtool_depend>
   <buildtool_depend>rosidl_generator_c</buildtool_depend>
   <buildtool_depend>rosidl_generator_cpp</buildtool_depend>
-  <buildtool_depend>rosidl_generator_dds_idl</buildtool_depend>
 
   <buildtool_export_depend>ament_cmake</buildtool_export_depend>
   <buildtool_export_depend>microxrcedds_cmake_module</buildtool_export_depend>
   <buildtool_export_depend>rosidl_typesupport_microxrcedds_shared</buildtool_export_depend>
   <buildtool_export_depend>rosidl_cmake</buildtool_export_depend>
   <buildtool_export_depend>rosidl_generator_c</buildtool_export_depend>
   <buildtool_export_depend>rosidl_generator_cpp</buildtool_export_depend>
-  <buildtool_export_depend>rosidl_generator_dds_idl</buildtool_export_depend> 
-
-  <build_export_depend>rmw</build_export_depend>
 
   <exec_depend>rosidl_parser</exec_depend>
   <exec_depend>rosidl_typesupport_interface</exec_depend>

diff --git a/rosidl_typesupport_microxrcedds_cpp/rosidl_typesupport_microxrcedds_cpp-extras.cmake.in b/rosidl_typesupport_microxrcedds_cpp/rosidl_typesupport_microxrcedds_cpp-extras.cmake.in
@@ -2,10 +2,11 @@
 # rosidl_typesupport_microxrcedds_cpp/
 #   rosidl_typesupport_microxrcedds_cpp-extras.cmake.in
 
-#find_package(microxrcedds_client_cmake_module QUIET)
-find_package(microcdr REQUIRED CONFIG)
-find_package(microxrcedds_client REQUIRED CONFIG)
-#find_package(microxrcedds_client REQUIRED MODULE)
+find_package(microxrcedds_cmake_module REQUIRED)
+find_package(MicroXRCEDDS REQUIRED MODULE)
+
+# specific order: dependents before dependencies
+list(APPEND rosidl_typesupport_microxrcedds_cpp_LIBRARIES microcdr)
 
 if(NOT microxrcedds_client_FOUND)
   message(STATUS

diff --git a/rosidl_typesupport_microxrcedds_cpp_tests/CMakeLists.txt b/rosidl_typesupport_microxrcedds_cpp_tests/CMakeLists.txt
@@ -15,7 +15,8 @@ endif()
 
 find_package(ament_cmake REQUIRED)
 
-
+find_package(rosidl_typesupport_microxrcedds_cpp QUIET)
+if(rosidl_typesupport_microxrcedds_cpp_FOUND)
 if(BUILD_TESTING)
   find_package(ament_lint_auto REQUIRED)
   ament_lint_auto_find_test_dependencies()
@@ -44,7 +45,7 @@ if(BUILD_TESTING)
     )
   endif()
 
-
+endif()
 endif()