Skip to content

[YAML Parser] Depend on rcutils only #470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 12, 2019
Merged

[YAML Parser] Depend on rcutils only #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
490ef7d
Make rcl_yaml_param_parser depend on rcutils only.
hidmic Jul 5, 2019
cf8bff1
Address peer review comments.
hidmic Jul 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions rcl_yaml_param_parser/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ project(rcl_yaml_param_parser)

find_package(ament_cmake_ros REQUIRED)
find_package(rcutils REQUIRED)
find_package(rcl REQUIRED)
find_package(libyaml_vendor REQUIRED)
find_package(yaml REQUIRED)

Expand All @@ -26,9 +25,18 @@ set(rcl_yaml_parser_sources
add_library(
${PROJECT_NAME}
${rcl_yaml_parser_sources})
ament_target_dependencies(${PROJECT_NAME} "yaml" "rcutils" "rcl")
ament_target_dependencies(${PROJECT_NAME} "yaml" "rcutils")

# Set the visibility to hidden by default if possible
if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
# Set the visibility of symbols to hidden by default for gcc and clang
# (this is already the default on Windows)
set_target_properties(${PROJECT_NAME}
PROPERTIES
COMPILE_FLAGS "-fvisibility=hidden"
)
endif()

rcl_set_symbol_visibility_hidden(${PROJECT_NAME} LANGUAGE "C")
# Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it.
target_compile_definitions(${PROJECT_NAME} PRIVATE "RCL_YAML_PARAM_PARSER_BUILDING_DLL")
Expand Down
4 changes: 2 additions & 2 deletions rcl_yaml_param_parser/include/rcl_yaml_param_parser/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#ifndef RCL_YAML_PARAM_PARSER__TYPES_H_
#define RCL_YAML_PARAM_PARSER__TYPES_H_

#include "rcl/allocator.h"
#include "rcutils/allocator.h"
#include "rcutils/types/string_array.h"

/// \typedef rcl_bool_array_t
Expand Down Expand Up @@ -81,7 +81,7 @@ typedef struct rcl_params_s
char ** node_names; ///< List of names of the node
rcl_node_params_t * params; ///< Array of parameters
size_t num_nodes; ///< Number of nodes
rcl_allocator_t allocator; ///< Allocator used
rcutils_allocator_t allocator; ///< Allocator used
} rcl_params_t;

#endif // RCL_YAML_PARAM_PARSER__TYPES_H_
1 change: 0 additions & 1 deletion rcl_yaml_param_parser/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<depend>libyaml_vendor</depend>
<depend>yaml</depend>
<build_depend>rcutils</build_depend>
<build_depend>rcl</build_depend>

<test_depend>ament_cmake_gtest</test_depend>
<test_depend>ament_lint_common</test_depend>
Expand Down
Loading