Rename macro name rcl_set_symbol_visibility_hidden

Signed-off-by: Sachin Suresh Bhat <bhatsach@amazon.com>
ros2 · Feb 27, 2019 · d49a8e9 · d49a8e9
1 parent 67e851e
commit d49a8e9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/rcl/CMakeLists.txt b/rcl/CMakeLists.txt
@@ -12,7 +12,7 @@ find_package(rosidl_generator_c REQUIRED)
 find_package(tinydir_vendor REQUIRED)
 
 include_directories(include)
-include(cmake/configure_rcl.cmake)
+include(cmake/rcl_set_symbol_visibility_hidden.cmake)
 include(cmake/get_default_rcl_logging_implementation.cmake)
 get_default_rcl_logging_implementation(RCL_LOGGING_IMPL)
 
@@ -73,7 +73,7 @@ ament_target_dependencies(${PROJECT_NAME}
 # 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_BUILDING_DLL")
-configure_rcl(${PROJECT_NAME} LANGUAGE "C")
+rcl_set_symbol_visibility_hidden(${PROJECT_NAME} LANGUAGE "C")
 
 install(
   TARGETS ${PROJECT_NAME}

diff --git a/rcl/cmake/configure_rcl.cmake → ...ke/rcl_set_symbol_visibility_hidden.cmake b/rcl/cmake/configure_rcl.cmake → ...ke/rcl_set_symbol_visibility_hidden.cmake
@@ -28,10 +28,10 @@
 #
 # @public
 #
-macro(configure_rcl library_target)
+macro(rcl_set_symbol_visibility_hidden library_target)
   cmake_parse_arguments(_ARG "" "LANGUAGE" "" ${ARGN})
   if(_ARG_UNPARSED_ARGUMENTS)
-    message(FATAL_ERROR "configure_rcl() called with unused arguments: ${_ARG_UNPARSED_ARGUMENTS}")
+    message(FATAL_ERROR "rcl_set_symbol_visibility_hidden() called with unused arguments: ${_ARG_UNPARSED_ARGUMENTS}")
   endif()
 
   if(NOT _ARG_LANGUAGE)
@@ -61,6 +61,6 @@ macro(configure_rcl library_target)
     endif()
 
   else()
-    message(FATAL_ERROR "configure_rcl() called with unsupported LANGUAGE: '${_ARG_LANGUAGE}'")
+    message(FATAL_ERROR "rcl_set_symbol_visibility_hidden() called with unsupported LANGUAGE: '${_ARG_LANGUAGE}'")
   endif()
 endmacro()
diff --git a/rcl/rcl-extras.cmake b/rcl/rcl-extras.cmake
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include("${rcl_DIR}/configure_rcl.cmake")
+include("${rcl_DIR}/rcl_set_symbol_visibility_hidden.cmake")
diff --git a/rcl_action/CMakeLists.txt b/rcl_action/CMakeLists.txt
@@ -57,7 +57,7 @@ ament_target_dependencies(${PROJECT_NAME}
   "rosidl_generator_c"
 )
 
-configure_rcl(${PROJECT_NAME} LANGUAGE "C")
+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_ACTION_BUILDING_DLL")

diff --git a/rcl_lifecycle/CMakeLists.txt b/rcl_lifecycle/CMakeLists.txt
@@ -48,7 +48,7 @@ ament_target_dependencies(rcl_lifecycle
   "rcutils"
 )
 
-configure_rcl(${PROJECT_NAME} LANGUAGE "C")
+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(rcl_lifecycle PRIVATE "RCL_LIFECYCLE_BUILDING_DLL")

diff --git a/rcl_yaml_param_parser/CMakeLists.txt b/rcl_yaml_param_parser/CMakeLists.txt
@@ -28,7 +28,7 @@ add_library(
   ${rcl_yaml_parser_sources})
 ament_target_dependencies(${PROJECT_NAME} "yaml" "rcutils" "rcl")
 
-configure_rcl(${PROJECT_NAME} LANGUAGE "C")
+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")