Skip to content

Commit

Permalink
Remove WIN specific compiler definition in configure_rcl
Browse files Browse the repository at this point in the history
Signed-off-by: Sachin Suresh Bhat <bhatsach@amazon.com>
  • Loading branch information
bhatsach committed Feb 26, 2019
1 parent 1a4f48e commit 67e851e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
3 changes: 3 additions & 0 deletions rcl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ ament_target_dependencies(${PROJECT_NAME}
"tinydir_vendor"
)

# 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")

install(
Expand Down
7 changes: 0 additions & 7 deletions rcl/cmake/configure_rcl.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,4 @@ macro(configure_rcl library_target)
else()
message(FATAL_ERROR "configure_rcl() called with unsupported LANGUAGE: '${_ARG_LANGUAGE}'")
endif()

if(WIN32)
# Causes the visibility macros to use dllexport rather than dllimport
# which is appropriate when building the dll but not consuming it.
target_compile_definitions(${library_target}
PRIVATE "RCL_BUILDING_DLL")
endif()
endmacro()

0 comments on commit 67e851e

Please sign in to comment.