Skip to content
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

Using ament_target_dependencies where possible #121

Merged
merged 3 commits into from
Mar 19, 2019
Merged

Using ament_target_dependencies where possible #121

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
092324e
Used ament_target_dependencies where possible
ivanpauno Mar 15, 2019
daaf740
Corrected with PR comment
ivanpauno Mar 18, 2019
d8c25bf
Adding class_loader include dir again
ivanpauno Mar 18, 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
10 changes: 7 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,13 @@ set(${PROJECT_NAME}_SRCS
src/multi_library_class_loader.cpp
)
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SRCS})
target_include_directories(${PROJECT_NAME}
PUBLIC include ${console_bridge_INCLUDE_DIRS} ${Poco_INCLUDE_DIRS})
target_link_libraries(${PROJECT_NAME} ${console_bridge_LIBRARIES} ${Poco_LIBRARIES})
if(ament_cmake_FOUND)
nuclearsandwich marked this conversation as resolved.
Show resolved Hide resolved
ament_target_dependencies(${PROJECT_NAME} "console_bridge" "Poco")
else()
target_include_directories(${PROJECT_NAME}
PUBLIC include ${console_bridge_INCLUDE_DIRS} ${Poco_INCLUDE_DIRS})
target_link_libraries(${PROJECT_NAME} ${console_bridge_LIBRARIES} ${Poco_LIBRARIES})
endif()
if(WIN32)
# Causes the visibility macros to use dllexport rather than dllimport
# which is appropriate when building the dll but not consuming it.
Expand Down