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

Jump to bottom

Fix file conflicts with YARP #19

Merged
merged 2 commits into from
Dec 18, 2023
Merged

Fix file conflicts with YARP #19

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
edb4450
Fix file conflicts with YARP
traversaro Dec 18, 2023
a362b15
Update CMakeLists.txt
traversaro Dec 18, 2023
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
2 changes: 1 addition & 1 deletion example/idl/rosPortable/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

cmake_minimum_required(VERSION 3.16)

find_package(YARP COMPONENTS os idl_tools REQUIRED)
find_package(YARP COMPONENTS os idl_tools rosmsg REQUIRED)

include_directories(${CMAKE_CURRENT_SOURCE_DIR})

Expand Down
9 changes: 1 addition & 8 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,6 @@ add_subdirectory(libYARP_wire_rep_utils)
add_subdirectory(carriers)

if(YARP_COMPILE_EXECUTABLES)
# idl compilers (thrift and ros)
# ros idl compiler
add_subdirectory(yarpidl_rosmsg)
if(NOT CREATE_SHARED_LIBS)
include(YarpInstallBasicPackageFiles)
yarp_install_basic_package_files(
YARP_idl_tools
INCLUDE_CONTENT "include(\"\\\${YARP_MODULE_DIR}/YarpIDL.cmake\")"
)
endif()
endif()
20 changes: 10 additions & 10 deletions src/carriers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@
include(YarpPlugin)
include(YarpPrintFeature)

yarp_begin_plugin_library(yarpcar
yarp_begin_plugin_library(yarpcarros
OPTION YARP_COMPILE_CARRIER_PLUGINS
DEFAULT ON
)

add_subdirectory(xmlrpc_carrier)
add_subdirectory(tcpros_carrier)

yarp_end_plugin_library(yarpcar QUIET)
add_library(YARP::yarpcar ALIAS yarpcar)
yarp_end_plugin_library(yarpcarros QUIET)
add_library(YARP::yarpcarros ALIAS yarpcarros)

install(
TARGETS yarpcar
EXPORT YARP_yarpcar
COMPONENT yarpcar
TARGETS yarpcarros
EXPORT YARP_yarpcarros
COMPONENT yarpcarros
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
)

include(YarpInstallBasicPackageFiles)
yarp_install_basic_package_files(YARP_yarpcar
DEPENDENCIES ${YARP_yarpcar_PUBLIC_DEPS}
PRIVATE_DEPENDENCIES ${YARP_yarpcar_PRIVATE_DEPS}
yarp_install_basic_package_files(YARP_yarpcarros
DEPENDENCIES ${YARP_yarpcarros_PUBLIC_DEPS}
PRIVATE_DEPENDENCIES ${YARP_yarpcarros_PRIVATE_DEPS}
)

set_property(TARGET yarpcar PROPERTY FOLDER "Plugins/Carrier")
set_property(TARGET yarpcarros PROPERTY FOLDER "Plugins/Carrier")
4 changes: 2 additions & 2 deletions src/yarpidl_rosmsg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ endif()

install(
TARGETS yarpidl_rosmsg
EXPORT YARP_idl_tools
COMPONENT YARP_idl_tools
EXPORT YARP_rosmsg
COMPONENT YARP_rosmsg
DESTINATION ${CMAKE_INSTALL_BINDIR}
)

Expand Down
Loading