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.

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

Plugin .ini files in icub-main are now automatially generated #586

Merged
merged 5 commits into from
Sep 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions src/libraries/icubmod/bcbBattery/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Authors: Marco Randazzo <marco.randazzo@iit.it>
# CopyPolicy: Released under the terms of the GNU GPL v2.0.

yarp_prepare_plugin(bcbBattery CATEGORY device TYPE BcbBattery INCLUDE bcbBattery.h EXTRA_CONFIG WRAPPER=BatteryWrapper)
yarp_prepare_plugin(bcbBattery CATEGORY device TYPE BcbBattery INCLUDE bcbBattery.h EXTRA_CONFIG WRAPPER=batteryWrapper)

if(NOT SKIP_bcbBattery)

Expand All @@ -13,6 +13,10 @@ target_link_libraries(bcbBattery ${YARP_LIBRARIES})

icub_export_plugin(bcbBattery)

yarp_install(FILES bcbBattery.ini DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})
yarp_install(TARGETS bcbBattery
COMPONENT Runtime
LIBRARY DESTINATION ${ICUB_DYNAMIC_PLUGINS_INSTALL_DIR}
ARCHIVE DESTINATION ${ICUB_STATIC_PLUGINS_INSTALL_DIR}
YARP_INI DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})

endif (NOT SKIP_bcbBattery)
5 changes: 0 additions & 5 deletions src/libraries/icubmod/bcbBattery/bcbBattery.ini

This file was deleted.

8 changes: 6 additions & 2 deletions src/libraries/icubmod/bmsBattery/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Authors: Marco Randazzo <marco.randazzo@iit.it>
# CopyPolicy: Released under the terms of the GNU GPL v2.0.

yarp_prepare_plugin(bmsBattery CATEGORY device TYPE BmsBattery INCLUDE bmsBattery.h EXTRA_CONFIG WRAPPER=BatteryWrapper)
yarp_prepare_plugin(bmsBattery CATEGORY device TYPE BmsBattery INCLUDE bmsBattery.h EXTRA_CONFIG WRAPPER=batteryWrapper)

if(NOT SKIP_bmsBattery)

Expand All @@ -13,6 +13,10 @@ target_link_libraries(bmsBattery ${YARP_LIBRARIES})

icub_export_plugin(bmsBattery)

yarp_install(FILES bmsBattery.ini DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})
yarp_install(TARGETS bmsBattery
COMPONENT Runtime
LIBRARY DESTINATION ${ICUB_DYNAMIC_PLUGINS_INSTALL_DIR}
ARCHIVE DESTINATION ${ICUB_STATIC_PLUGINS_INSTALL_DIR}
YARP_INI DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})

endif (NOT SKIP_bmsBattery)
5 changes: 0 additions & 5 deletions src/libraries/icubmod/bmsBattery/bmsBattery.ini

This file was deleted.

8 changes: 6 additions & 2 deletions src/libraries/icubmod/canBusAnalogSensor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Authors: Marco Randazzo <marco.randazzo@iit.it>
# CopyPolicy: Released under the terms of the GNU GPL v2.0.

yarp_prepare_plugin(canBusAnalogSensor CATEGORY device TYPE CanBusAnalogSensor INCLUDE CanBusAnalogSensor.h EXTRA_CONFIG WRAPPER=AnalogServer)
yarp_prepare_plugin(canBusAnalogSensor CATEGORY device TYPE CanBusAnalogSensor INCLUDE CanBusAnalogSensor.h EXTRA_CONFIG WRAPPER=analogServer)

if(NOT SKIP_canBusAnalogSensor)

Expand All @@ -15,7 +15,11 @@ target_link_libraries(canBusAnalogSensor ${YARP_LIBRARIES})

icub_export_plugin(canBusAnalogSensor)

yarp_install(FILES canBusAnalogSensor.ini DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})
yarp_install(TARGETS canBusAnalogSensor
COMPONENT Runtime
LIBRARY DESTINATION ${ICUB_DYNAMIC_PLUGINS_INSTALL_DIR}
ARCHIVE DESTINATION ${ICUB_STATIC_PLUGINS_INSTALL_DIR}
YARP_INI DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})

else(ICUB_HAS_icub_firmware_shared)
message(ERROR " canBusAnalogSensor: cannot find icub_firmware_shared library, turn off device
Expand Down

This file was deleted.

8 changes: 6 additions & 2 deletions src/libraries/icubmod/canBusDoubleFTSensor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Authors: Marco Randazzo <marco.randazzo@iit.it>
# CopyPolicy: Released under the terms of the GNU GPL v2.0.

yarp_prepare_plugin(canBusDoubleFTSensor CATEGORY device TYPE CanBusDoubleFTSensor INCLUDE CanBusDoubleFTSensor.h EXTRA_CONFIG WRAPPER=AnalogServer)
yarp_prepare_plugin(canBusDoubleFTSensor CATEGORY device TYPE CanBusDoubleFTSensor INCLUDE CanBusDoubleFTSensor.h EXTRA_CONFIG WRAPPER=analogServer)

if(NOT SKIP_canBusDoubleFTSensor)

Expand All @@ -15,7 +15,11 @@ target_link_libraries(canBusDoubleFTSensor ${YARP_LIBRARIES})

icub_export_plugin(canBusDoubleFTSensor)

yarp_install(FILES CanBusDoubleFTSensor.ini DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})
yarp_install(TARGETS canBusDoubleFTSensor
COMPONENT Runtime
LIBRARY DESTINATION ${ICUB_DYNAMIC_PLUGINS_INSTALL_DIR}
ARCHIVE DESTINATION ${ICUB_STATIC_PLUGINS_INSTALL_DIR}
YARP_INI DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})

else(ICUB_HAS_icub_firmware_shared)
message(ERROR " canBusDoubleFTSensor: cannot find icub_firmware_shared library, turn off device
Expand Down

This file was deleted.

6 changes: 5 additions & 1 deletion src/libraries/icubmod/canBusInertialMTB/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ target_link_libraries(canBusInertialMTB ${YARP_LIBRARIES})

icub_export_plugin(canBusInertialMTB)

yarp_install(FILES canBusInertialMTB.ini DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})
yarp_install(TARGETS canBusInertialMTB
COMPONENT Runtime
LIBRARY DESTINATION ${ICUB_DYNAMIC_PLUGINS_INSTALL_DIR}
ARCHIVE DESTINATION ${ICUB_STATIC_PLUGINS_INSTALL_DIR}
YARP_INI DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})

else(ICUB_HAS_icub_firmware_shared)
message(ERROR " canBusInertialMTB: cannot find icub_firmware_shared library, turn off device
Expand Down
5 changes: 0 additions & 5 deletions src/libraries/icubmod/canBusInertialMTB/canBusInertialMTB.ini

This file was deleted.

6 changes: 5 additions & 1 deletion src/libraries/icubmod/canBusMotionControl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ if(ICUB_HAS_icub_firmware_shared)
TARGET_LINK_LIBRARIES(canmotioncontrol ${ACE_LIBRARIES} iCubDev ${YARP_LIBRARIES})

icub_export_plugin(canmotioncontrol)
yarp_install(FILES canmotioncontrol.ini DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})
yarp_install(TARGETS canmotioncontrol
COMPONENT Runtime
LIBRARY DESTINATION ${ICUB_DYNAMIC_PLUGINS_INSTALL_DIR}
ARCHIVE DESTINATION ${ICUB_STATIC_PLUGINS_INSTALL_DIR}
YARP_INI DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})

else(ICUB_HAS_icub_firmware_shared)
message(ERROR " canBusMotionControl: cannot find icub_firmware_shared library, turn off device
Expand Down

This file was deleted.

9 changes: 6 additions & 3 deletions src/libraries/icubmod/canBusSkin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Authors: Lorenzo Natale
# CopyPolicy: Released under the terms of the GNU GPL v2.0.

yarp_prepare_plugin(canBusSkin CATEGORY device TYPE CanBusSkin INCLUDE CanBusSkin.h EXTRA_CONFIG WRAPPER=grabber)
yarp_prepare_plugin(canBusSkin CATEGORY device TYPE CanBusSkin INCLUDE CanBusSkin.h EXTRA_CONFIG WRAPPER=skinwrapper)

if (NOT SKIP_canBusSkin)
if(ICUB_HAS_icub_firmware_shared)
Expand All @@ -14,8 +14,11 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
yarp_add_plugin(canBusSkin CanBusSkin.h CanBusSkin.cpp ../skinLib/SkinConfigReader.cpp ../skinLib/SkinDiagnostics.h)
target_link_libraries(canBusSkin ${YARP_LIBRARIES} ${ICUB_LIBRARIES})

icub_export_plugin(canBusSkin)
yarp_install(FILES canBusSkin.ini DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})
yarp_install(TARGETS canBusSkin
COMPONENT Runtime
LIBRARY DESTINATION ${ICUB_DYNAMIC_PLUGINS_INSTALL_DIR}
ARCHIVE DESTINATION ${ICUB_STATIC_PLUGINS_INSTALL_DIR}
YARP_INI DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})

else(ICUB_HAS_icub_firmware_shared)
message(ERROR " canBusSkin: cannot find icub_firmware_shared library, turn off device
Expand Down
5 changes: 0 additions & 5 deletions src/libraries/icubmod/canBusSkin/canBusSkin.ini

This file was deleted.

10 changes: 8 additions & 2 deletions src/libraries/icubmod/canBusVirtualAnalogSensor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Authors: Marco Randazzo <marco.randazzo@iit.it>
# CopyPolicy: Released under the terms of the GNU GPL v2.0.

yarp_prepare_plugin(canBusVirtualAnalogSensor CATEGORY device TYPE CanBusVirtualAnalogSensor INCLUDE CanBusVirtualAnalogSensor.h EXTRA_CONFIG WRAPPER=grabber)
yarp_prepare_plugin(canBusVirtualAnalogSensor CATEGORY device TYPE CanBusVirtualAnalogSensor INCLUDE CanBusVirtualAnalogSensor.h EXTRA_CONFIG WRAPPER=virtualAnalogServer)

if (NOT SKIP_canBusVirtualAnalogSensor)

Expand All @@ -14,7 +14,13 @@ if(ICUB_HAS_icub_firmware_shared)
target_link_libraries(canBusVirtualAnalogSensor ${YARP_LIBRARIES})

icub_export_plugin(canBusVirtualAnalogSensor)
yarp_install(FILES canBusVirtualAnalogSensor.ini DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})

yarp_install(TARGETS canBusVirtualAnalogSensor
COMPONENT Runtime
LIBRARY DESTINATION ${ICUB_DYNAMIC_PLUGINS_INSTALL_DIR}
ARCHIVE DESTINATION ${ICUB_STATIC_PLUGINS_INSTALL_DIR}
YARP_INI DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})


else(ICUB_HAS_icub_firmware_shared)
message(ERROR " canBusVirtualAnalogSensor: cannot find icub_firmware_shared library, turn off device
Expand Down

This file was deleted.

12 changes: 10 additions & 2 deletions src/libraries/icubmod/cartesianController/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ if(NOT SKIP_cartesiancontrollerserver)
yarp_add_plugin(cartesiancontrollerserver ${server_source} ${server_header})
target_link_libraries(cartesiancontrollerserver iKin ${YARP_LIBRARIES})
icub_export_plugin(cartesiancontrollerserver)
yarp_install(FILES cartesiancontrollerserver.ini DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})
yarp_install(TARGETS cartesiancontrollerserver
COMPONENT Runtime
LIBRARY DESTINATION ${ICUB_DYNAMIC_PLUGINS_INSTALL_DIR}
ARCHIVE DESTINATION ${ICUB_STATIC_PLUGINS_INSTALL_DIR}
YARP_INI DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})
endif()

yarp_prepare_plugin(cartesiancontrollerclient CATEGORY device
Expand All @@ -37,7 +41,11 @@ if(NOT SKIP_cartesiancontrollerclient)
target_link_libraries(cartesiancontrollerclient iKin ${YARP_LIBRARIES})

icub_export_plugin(cartesiancontrollerclient)
yarp_install(FILES cartesiancontrollerclient.ini DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})
yarp_install(TARGETS cartesiancontrollerclient
COMPONENT Runtime
LIBRARY DESTINATION ${ICUB_DYNAMIC_PLUGINS_INSTALL_DIR}
ARCHIVE DESTINATION ${ICUB_STATIC_PLUGINS_INSTALL_DIR}
YARP_INI DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})
randaz81 marked this conversation as resolved.
Show resolved Hide resolved
endif()


Expand Down

This file was deleted.

This file was deleted.

11 changes: 8 additions & 3 deletions src/libraries/icubmod/cfw2Can/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
yarp_prepare_plugin(cfw2can
CATEGORY device
TYPE yarp::dev::Cfw2Can
INCLUDE Cfw2Can.h
EXTRA_CONFIG WRAPPER="")
INCLUDE Cfw2Can.h )

IF (NOT SKIP_cfw2can)
FIND_PACKAGE(CFW2CANAPI)
Expand All @@ -20,7 +19,13 @@ IF (NOT SKIP_cfw2can)
yarp_add_plugin(cfw2can Cfw2Can.cpp Cfw2Can.h)
TARGET_LINK_LIBRARIES(cfw2can ${CFW2CANAPI_LIB} pthread ${YARP_LIBRARIES})
icub_export_plugin(cfw2can)
yarp_install(FILES cfw2can.ini DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})

yarp_install(TARGETS cfw2can
COMPONENT Runtime
LIBRARY DESTINATION ${ICUB_DYNAMIC_PLUGINS_INSTALL_DIR}
ARCHIVE DESTINATION ${ICUB_STATIC_PLUGINS_INSTALL_DIR}
YARP_INI DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})

ENDIF (NOT CFW2CANAPI_FOUND)
ENDIF (NOT SKIP_cfw2can)

4 changes: 0 additions & 4 deletions src/libraries/icubmod/cfw2Can/cfw2can.ini

This file was deleted.

7 changes: 6 additions & 1 deletion src/libraries/icubmod/dragonfly2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@ IF(NOT SKIP_dragonfly2)
yarp_add_plugin(dragonfly2 common/DragonflyDeviceDriver2.h common/DragonflyDeviceDriver2.cpp ${EXTRA_SOURCES})
target_link_libraries(dragonfly2 ${YARP_LIBRARIES} ${DRAGONFLYAPI_LIB})
icub_export_plugin(dragonfly2)
yarp_install(FILES dragonfly2.ini dragonfly2raw.ini DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})

yarp_install(TARGETS dragonfly2
COMPONENT Runtime
LIBRARY DESTINATION ${ICUB_DYNAMIC_PLUGINS_INSTALL_DIR}
ARCHIVE DESTINATION ${ICUB_STATIC_PLUGINS_INSTALL_DIR}
YARP_INI DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})
randaz81 marked this conversation as resolved.
Show resolved Hide resolved

if(NOT WIN32)
add_executable(firewirebusreset linux/fwBusReset_main.cpp ${EXTRA_SOURCES})
Expand Down
5 changes: 0 additions & 5 deletions src/libraries/icubmod/dragonfly2/dragonfly2.ini

This file was deleted.

5 changes: 0 additions & 5 deletions src/libraries/icubmod/dragonfly2/dragonfly2raw.ini

This file was deleted.

8 changes: 6 additions & 2 deletions src/libraries/icubmod/embObjAnalog/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
yarp_prepare_plugin(embObjAnalogSensor CATEGORY device
TYPE yarp::dev::embObjAnalogSensor
INCLUDE embObjAnalogSensor.h
EXTRA_CONFIG WRAPPER=AnalogServer)
EXTRA_CONFIG WRAPPER=analogServer)

IF (NOT SKIP_embObjAnalogSensor)

Expand All @@ -19,7 +19,11 @@ IF (NOT SKIP_embObjAnalogSensor)
TARGET_LINK_LIBRARIES(embObjAnalogSensor ethResources ${YARP_LIBRARIES} ${ACE_LIBRARIES})
icub_export_plugin(embObjAnalogSensor)

yarp_install(FILES embObjAnalogSensor.ini DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})
yarp_install(TARGETS embObjAnalogSensor
COMPONENT Runtime
LIBRARY DESTINATION ${ICUB_DYNAMIC_PLUGINS_INSTALL_DIR}
ARCHIVE DESTINATION ${ICUB_STATIC_PLUGINS_INSTALL_DIR}
YARP_INI DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})

ENDIF (NOT SKIP_embObjAnalogSensor)

5 changes: 0 additions & 5 deletions src/libraries/icubmod/embObjAnalog/embObjAnalogSensor.ini

This file was deleted.

8 changes: 6 additions & 2 deletions src/libraries/icubmod/embObjFTsensor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
yarp_prepare_plugin(embObjFTsensor CATEGORY device
TYPE yarp::dev::embObjFTsensor
INCLUDE embObjFTsensor.h
EXTRA_CONFIG WRAPPER=AnalogServer)
EXTRA_CONFIG WRAPPER=analogServer)

IF (NOT SKIP_embObjFTsensor)

Expand All @@ -20,7 +20,11 @@ IF (NOT SKIP_embObjFTsensor)
TARGET_LINK_LIBRARIES(embObjFTsensor ethResources ${YARP_LIBRARIES} ${ACE_LIBRARIES})
icub_export_plugin(embObjFTsensor)

yarp_install(FILES embObjFTsensor.ini DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})
yarp_install(TARGETS embObjFTsensor
COMPONENT Runtime
LIBRARY DESTINATION ${ICUB_DYNAMIC_PLUGINS_INSTALL_DIR}
ARCHIVE DESTINATION ${ICUB_STATIC_PLUGINS_INSTALL_DIR}
YARP_INI DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})

ENDIF (NOT SKIP_embObjFTsensor)

5 changes: 0 additions & 5 deletions src/libraries/icubmod/embObjFTsensor/embObjFTsensor.ini

This file was deleted.

8 changes: 6 additions & 2 deletions src/libraries/icubmod/embObjIMU/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
yarp_prepare_plugin(embObjIMU CATEGORY device
TYPE yarp::dev::embObjIMU
INCLUDE embObjIMU.h
EXTRA_CONFIG WRAPPER=multipleanalogsensorsserver)
EXTRA_CONFIG WRAPPER=inertial)

IF (NOT SKIP_embObjIMU)

Expand All @@ -20,7 +20,11 @@ IF (NOT SKIP_embObjIMU)
TARGET_LINK_LIBRARIES(embObjIMU ethResources ${YARP_LIBRARIES} ${ACE_LIBRARIES})
icub_export_plugin(embObjIMU)

yarp_install(FILES embObjIMU.ini DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})
yarp_install(TARGETS embObjIMU
COMPONENT Runtime
LIBRARY DESTINATION ${ICUB_DYNAMIC_PLUGINS_INSTALL_DIR}
ARCHIVE DESTINATION ${ICUB_STATIC_PLUGINS_INSTALL_DIR}
YARP_INI DESTINATION ${ICUB_PLUGIN_MANIFESTS_INSTALL_DIR})

ENDIF (NOT SKIP_embObjIMU)

5 changes: 0 additions & 5 deletions src/libraries/icubmod/embObjIMU/embObjIMU.ini

This file was deleted.

Loading