From 38e3459f2d18b14cb811292bdec96d79ae92c706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20=C5=81ukawski?= Date: Sat, 16 Jun 2018 13:52:14 +0200 Subject: [PATCH] Use on-system color-debug, update inclusions --- .travis.yml | 6 ++++++ CMakeLists.txt | 17 +++------------- cmake/ycm-modules/BuildCOLOR_DEBUG.cmake | 20 ------------------- .../exampleCanBusControlboard/CMakeLists.txt | 10 +++++----- .../ExampleCanBusControlboard.cpp | 2 +- .../cpp/exampleCanBusControlboard/main.cpp | 2 +- libraries/OneCanBusOneWrapper/CMakeLists.txt | 7 +++---- .../OneCanBusOneWrapper.cpp | 2 +- .../TwoCanBusThreeWrappers/CMakeLists.txt | 7 +++---- .../TwoCanBusThreeWrappers.cpp | 2 +- .../AmorControlboard/AmorControlboard.hpp | 2 +- .../AmorControlboard/CMakeLists.txt | 5 ++--- .../YarpPlugins/AravisGigE/AravisGigE.hpp | 2 +- .../YarpPlugins/AravisGigE/CMakeLists.txt | 5 ++--- .../CanBusControlboard/CMakeLists.txt | 3 +-- .../CanBusControlboard/CanBusControlboard.hpp | 2 +- .../YarpPlugins/CanBusFake/CMakeLists.txt | 3 +-- .../YarpPlugins/CanBusFake/CanBusFake.hpp | 2 +- .../YarpPlugins/CanBusHico/CMakeLists.txt | 3 +-- .../YarpPlugins/CanBusHico/CanBusHico.hpp | 2 +- .../YarpPlugins/CuiAbsolute/CMakeLists.txt | 3 +-- .../YarpPlugins/CuiAbsolute/CuiAbsolute.hpp | 2 +- .../FakeControlboard/CMakeLists.txt | 3 +-- .../FakeControlboard/DeviceDriverImpl.cpp | 2 +- .../FakeControlboard/FakeControlboard.cpp | 2 +- .../FakeControlboard/IControlLimits2Impl.cpp | 2 +- .../FakeControlboard/IControlLimitsImpl.cpp | 2 +- .../FakeControlboard/IControlMode2Impl.cpp | 2 +- .../FakeControlboard/IControlModeImpl.cpp | 2 +- .../IPositionControl2Impl.cpp | 2 +- .../FakeControlboard/IPositionControlImpl.cpp | 2 +- .../FakeControlboard/ITorqueControlImpl.cpp | 2 +- .../IVelocityControl2Impl.cpp | 2 +- .../FakeControlboard/IVelocityControlImpl.cpp | 2 +- .../FakeControlboard/RateThreadImpl.cpp | 2 +- .../YarpPlugins/FakeJoint/CMakeLists.txt | 3 +-- libraries/YarpPlugins/FakeJoint/FakeJoint.hpp | 2 +- libraries/YarpPlugins/Jr3/CMakeLists.txt | 3 +-- libraries/YarpPlugins/Jr3/Jr3.hpp | 2 +- .../YarpPlugins/LacqueyFetch/CMakeLists.txt | 3 +-- .../YarpPlugins/LacqueyFetch/LacqueyFetch.hpp | 2 +- .../LeapMotionSensor/CMakeLists.txt | 5 ++--- .../LeapMotionSensor/DeviceDriverImpl.cpp | 2 +- .../LeapMotionSensor/IAnalogSensorImpl.cpp | 2 +- .../ProximitySensorsClient/CMakeLists.txt | 3 +-- .../DeviceDriverImpl.cpp | 2 +- .../IProximitySensorsImpl.cpp | 2 +- .../ProximitySensorsClient.cpp | 2 +- .../YarpPlugins/SpaceNavigator/CMakeLists.txt | 3 +-- .../SpaceNavigator/SpaceNavigator.hpp | 2 +- .../YarpPlugins/TechnosoftIpos/CMakeLists.txt | 3 +-- .../TechnosoftIpos/TechnosoftIpos.hpp | 2 +- .../YarpPlugins/TextilesHand/CMakeLists.txt | 3 +-- .../YarpPlugins/TextilesHand/TextilesHand.hpp | 2 +- .../YarpPlugins/WiimoteSensor/CMakeLists.txt | 3 +-- .../WiimoteSensor/DeviceDriverImpl.cpp | 2 +- .../WiimoteSensor/IAnalogSensorImpl.cpp | 2 +- .../WiimoteSensor/WiimoteDispatcherThread.cpp | 2 +- .../WiimoteSensor/WiimoteSensor.cpp | 2 +- programs/checkCanBus/CMakeLists.txt | 3 +-- programs/checkCanBus/CheckCanBus.cpp | 2 +- programs/checkCanBus/ThreadImpl.cpp | 2 +- programs/checkCanBus/main.cpp | 2 +- programs/dumpCanBus/CMakeLists.txt | 3 +-- programs/dumpCanBus/DumpCanBus.cpp | 2 +- programs/dumpCanBus/ThreadImpl.cpp | 2 +- programs/dumpCanBus/main.cpp | 2 +- programs/launchLocomotion/CMakeLists.txt | 3 +-- programs/launchLocomotion/main.cpp | 2 +- programs/launchManipulation/CMakeLists.txt | 3 +-- programs/launchManipulation/main.cpp | 2 +- programs/oneCanBusOneWrapper/CMakeLists.txt | 3 +-- programs/oneCanBusOneWrapper/main.cpp | 2 +- tests/testCuiAbsolute/CMakeLists.txt | 3 +-- tests/testCuiAbsolute/testCuiAbsolute.cpp | 2 +- tests/testTechnosoftIpos/CMakeLists.txt | 3 +-- .../testTechnosoftIpos/testTechnosoftIpos.cpp | 2 +- 77 files changed, 94 insertions(+), 144 deletions(-) delete mode 100644 cmake/ycm-modules/BuildCOLOR_DEBUG.cmake diff --git a/.travis.yml b/.travis.yml index 3713dddcd..1249a9b34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,12 @@ before_install: install: #-- Install 3rd-party dependencies - sudo apt-get install libboost-thread-dev libeigen3-dev libspnav-dev libxwiimote-dev libusb-1.0-0-dev libgtest-dev + #-- Install color-debug + - git clone https://github.com/roboticslab-uc3m/color-debug + - cd color-debug && mkdir build && cd build + - cmake .. + - sudo make install + - cd ../.. #-- Install yarp - git clone --branch="$YARP_CHECKOUT" https://github.com/robotology/yarp - cd yarp && mkdir build && cd build diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c3211653..74487a547 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,26 +62,15 @@ if(ENABLE_coverage) endif() endif() -# Superbuild phase - include color-debug. -include(FindOrBuildPackage) -find_or_build_package(COLOR_DEBUG) - -# find_or_build_package() doesn't bring into scope COLOR_DEBUG_INCLUDE_DIRS -# nor other config variables. If a system copy is found, we have to call the -# find_package() command and proceed as usual. -if(USE_SYSTEM_COLOR_DEBUG) - find_package(COLOR_DEBUG REQUIRED) - include_directories(${COLOR_DEBUG_INCLUDE_DIRS}) - add_library(COLOR_DEBUG UNKNOWN IMPORTED) -endif() - # Store list of exported targets in global scope. set_property(GLOBAL PROPERTY ROBOTICSLAB_YARP_DEVICES_TARGETS) # Create targets if specific requirements are satisfied. include(CMakeDependentOption) -# Find YARP (main dependency). +# Find project's hard dependencies. +find_package(COLOR_DEBUG REQUIRED) + # https://github.com/roboticslab-uc3m/questions-and-answers/issues/65 find_package(YARP 3.0 QUIET COMPONENTS OS dev sig) if(NOT YARP_FOUND) diff --git a/cmake/ycm-modules/BuildCOLOR_DEBUG.cmake b/cmake/ycm-modules/BuildCOLOR_DEBUG.cmake deleted file mode 100644 index 87c7b0ad7..000000000 --- a/cmake/ycm-modules/BuildCOLOR_DEBUG.cmake +++ /dev/null @@ -1,20 +0,0 @@ -include(YCMEPHelper) - -ycm_ep_helper(COLOR_DEBUG TYPE GIT - STYLE GITHUB - REPOSITORY roboticslab-uc3m/color-debug.git - TAG master) - -# Include path to ColorDebug.hpp. -ExternalProject_Get_Property(COLOR_DEBUG INSTALL_DIR) -include_directories(${INSTALL_DIR}/${CMAKE_INSTALL_INCLUDEDIR}) - -# CMake has not downloaded color-debug yet (this happens on build step). -if(NOT COLOR_DEBUG_FOUND) - message(STATUS "Build COLOR_DEBUG target and configure project again to make advanced CD options available on UI.") - # Fails on first configure due to the lack of a cache file. - #execute_process(COMMAND ${CMAKE_COMMAND} --build . --target COLOR_DEBUG WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -else() - # Load COLOR_DEBUGConfig.cmake, which in turn includes ColorDebugOptions.cmake. - find_package(COLOR_DEBUG QUIET) -endif() diff --git a/examples/cpp/exampleCanBusControlboard/CMakeLists.txt b/examples/cpp/exampleCanBusControlboard/CMakeLists.txt index 28fcb0f75..9cb292912 100644 --- a/examples/cpp/exampleCanBusControlboard/CMakeLists.txt +++ b/examples/cpp/exampleCanBusControlboard/CMakeLists.txt @@ -1,20 +1,20 @@ -cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR) +cmake_minimum_required(VERSION 3.0 FATAL_ERROR) project(exampleCanBusControlboard) find_package(YARP REQUIRED) find_package(COLOR_DEBUG REQUIRED) -include_directories(${YARP_INCLUDE_DIRS} - ${COLOR_DEBUG_INCLUDE_DIRS}) +include_directories(${YARP_INCLUDE_DIRS}) add_executable(exampleCanBusControlboard main.cpp ExampleCanBusControlboard.cpp ExampleCanBusControlboard.hpp) - + target_link_libraries(exampleCanBusControlboard YARP::YARP_OS YARP::YARP_init - YARP::YARP_dev) + YARP::YARP_dev + ROBOTICSLAB::ColorDebug) include(GNUInstallDirs) diff --git a/examples/cpp/exampleCanBusControlboard/ExampleCanBusControlboard.cpp b/examples/cpp/exampleCanBusControlboard/ExampleCanBusControlboard.cpp index 8949fc0e9..e670e29be 100644 --- a/examples/cpp/exampleCanBusControlboard/ExampleCanBusControlboard.cpp +++ b/examples/cpp/exampleCanBusControlboard/ExampleCanBusControlboard.cpp @@ -4,7 +4,7 @@ #include -#include +#include /************************************************************************/ roboticslab::ExampleCanBusControlboard::ExampleCanBusControlboard() { } diff --git a/examples/cpp/exampleCanBusControlboard/main.cpp b/examples/cpp/exampleCanBusControlboard/main.cpp index 6a7d929bf..480e840ca 100644 --- a/examples/cpp/exampleCanBusControlboard/main.cpp +++ b/examples/cpp/exampleCanBusControlboard/main.cpp @@ -93,7 +93,7 @@ Response: [ok] #include #include -#include +#include #include "ExampleCanBusControlboard.hpp" diff --git a/libraries/OneCanBusOneWrapper/CMakeLists.txt b/libraries/OneCanBusOneWrapper/CMakeLists.txt index 0a69c7115..97b6689de 100644 --- a/libraries/OneCanBusOneWrapper/CMakeLists.txt +++ b/libraries/OneCanBusOneWrapper/CMakeLists.txt @@ -5,12 +5,11 @@ if(ENABLE_OneCanBusOneWrapper) add_library(OneCanBusOneWrapper OneCanBusOneWrapper.cpp OneCanBusOneWrapper.hpp) -add_dependencies(OneCanBusOneWrapper COLOR_DEBUG) - set_target_properties(OneCanBusOneWrapper PROPERTIES PUBLIC_HEADER OneCanBusOneWrapper.hpp) -target_link_libraries(OneCanBusOneWrapper LINK_PUBLIC YARP::YARP_OS - YARP::YARP_dev) +target_link_libraries(OneCanBusOneWrapper PUBLIC YARP::YARP_OS + YARP::YARP_dev + PRIVATE ROBOTICSLAB::ColorDebug) target_include_directories(OneCanBusOneWrapper PUBLIC $ $) diff --git a/libraries/OneCanBusOneWrapper/OneCanBusOneWrapper.cpp b/libraries/OneCanBusOneWrapper/OneCanBusOneWrapper.cpp index 43d2b6a48..91c34c420 100644 --- a/libraries/OneCanBusOneWrapper/OneCanBusOneWrapper.cpp +++ b/libraries/OneCanBusOneWrapper/OneCanBusOneWrapper.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include namespace roboticslab { diff --git a/libraries/TwoCanBusThreeWrappers/CMakeLists.txt b/libraries/TwoCanBusThreeWrappers/CMakeLists.txt index a7c54dbd3..622e25bd8 100644 --- a/libraries/TwoCanBusThreeWrappers/CMakeLists.txt +++ b/libraries/TwoCanBusThreeWrappers/CMakeLists.txt @@ -5,12 +5,11 @@ if(ENABLE_TwoCanBusThreeWrappers) add_library(TwoCanBusThreeWrappers TwoCanBusThreeWrappers.cpp TwoCanBusThreeWrappers.hpp) -add_dependencies(TwoCanBusThreeWrappers COLOR_DEBUG) - set_target_properties(TwoCanBusThreeWrappers PROPERTIES PUBLIC_HEADER TwoCanBusThreeWrappers.hpp) -target_link_libraries(TwoCanBusThreeWrappers LINK_PUBLIC YARP::YARP_OS - YARP::YARP_dev) +target_link_libraries(TwoCanBusThreeWrappers PUBLIC YARP::YARP_OS + YARP::YARP_dev + PRIVATE ROBOTICSLAB::ColorDebug) target_include_directories(TwoCanBusThreeWrappers PUBLIC $ $) diff --git a/libraries/TwoCanBusThreeWrappers/TwoCanBusThreeWrappers.cpp b/libraries/TwoCanBusThreeWrappers/TwoCanBusThreeWrappers.cpp index 2f34456ff..281df5ef0 100644 --- a/libraries/TwoCanBusThreeWrappers/TwoCanBusThreeWrappers.cpp +++ b/libraries/TwoCanBusThreeWrappers/TwoCanBusThreeWrappers.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include namespace roboticslab { diff --git a/libraries/YarpPlugins/AmorControlboard/AmorControlboard.hpp b/libraries/YarpPlugins/AmorControlboard/AmorControlboard.hpp index d79a6ef59..a2d818e41 100644 --- a/libraries/YarpPlugins/AmorControlboard/AmorControlboard.hpp +++ b/libraries/YarpPlugins/AmorControlboard/AmorControlboard.hpp @@ -13,7 +13,7 @@ #include -#include "ColorDebug.hpp" +#include "ColorDebug.h" #define DEFAULT_CAN_LIBRARY "libeddriver.so" #define DEFAULT_CAN_PORT 0 diff --git a/libraries/YarpPlugins/AmorControlboard/CMakeLists.txt b/libraries/YarpPlugins/AmorControlboard/CMakeLists.txt index 6140f3790..69f463bdf 100644 --- a/libraries/YarpPlugins/AmorControlboard/CMakeLists.txt +++ b/libraries/YarpPlugins/AmorControlboard/CMakeLists.txt @@ -35,11 +35,10 @@ if(NOT SKIP_AmorControlboard) ITorqueControlImpl.cpp IInteractionModeImpl.cpp) - add_dependencies(AmorControlboard COLOR_DEBUG) - target_link_libraries(AmorControlboard YARP::YARP_OS YARP::YARP_dev - AMOR::amor_api) + AMOR::amor_api + ROBOTICSLAB::ColorDebug) yarp_install(TARGETS AmorControlboard COMPONENT runtime diff --git a/libraries/YarpPlugins/AravisGigE/AravisGigE.hpp b/libraries/YarpPlugins/AravisGigE/AravisGigE.hpp index c458c1e5d..2afda7edd 100644 --- a/libraries/YarpPlugins/AravisGigE/AravisGigE.hpp +++ b/libraries/YarpPlugins/AravisGigE/AravisGigE.hpp @@ -8,7 +8,7 @@ #include -#include "ColorDebug.hpp" +#include "ColorDebug.h" namespace roboticslab { diff --git a/libraries/YarpPlugins/AravisGigE/CMakeLists.txt b/libraries/YarpPlugins/AravisGigE/CMakeLists.txt index 45e8d767b..0498c1b15 100644 --- a/libraries/YarpPlugins/AravisGigE/CMakeLists.txt +++ b/libraries/YarpPlugins/AravisGigE/CMakeLists.txt @@ -26,11 +26,10 @@ if(NOT SKIP_AravisGigE) IFrameGrabberImageRawImpl.cpp IFrameGrabberImpl.cpp) - add_dependencies(AravisGigE COLOR_DEBUG) - target_link_libraries(AravisGigE YARP::YARP_OS YARP::YARP_dev - ${ARAVIS_LIBRARIES}) + ${ARAVIS_LIBRARIES} + ROBOTICSLAB::ColorDebug) yarp_install(TARGETS AravisGigE COMPONENT runtime diff --git a/libraries/YarpPlugins/CanBusControlboard/CMakeLists.txt b/libraries/YarpPlugins/CanBusControlboard/CMakeLists.txt index b12f992fe..94e797f0e 100644 --- a/libraries/YarpPlugins/CanBusControlboard/CMakeLists.txt +++ b/libraries/YarpPlugins/CanBusControlboard/CMakeLists.txt @@ -26,10 +26,9 @@ yarp_add_plugin(CanBusControlboard CanBusControlboard.cpp IVelocityControl2Impl.cpp ThreadImpl.cpp) -add_dependencies(CanBusControlboard COLOR_DEBUG) - target_link_libraries(CanBusControlboard YARP::YARP_OS YARP::YARP_dev + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces) # Hack, fool CMake to think that YARP already switched to 3.0 while still at devel. diff --git a/libraries/YarpPlugins/CanBusControlboard/CanBusControlboard.hpp b/libraries/YarpPlugins/CanBusControlboard/CanBusControlboard.hpp index c30666cb7..5bb8f584f 100644 --- a/libraries/YarpPlugins/CanBusControlboard/CanBusControlboard.hpp +++ b/libraries/YarpPlugins/CanBusControlboard/CanBusControlboard.hpp @@ -24,7 +24,7 @@ //#define CD_HIDE_INFO //-- Can be managed from father CMake. //#define CD_HIDE_WARNING //-- Can be managed from father CMake. //#define CD_HIDE_ERROR //-- Can be managed from father CMake. -#include "ColorDebug.hpp" +#include "ColorDebug.h" #include "ICanBusSharer.h" diff --git a/libraries/YarpPlugins/CanBusFake/CMakeLists.txt b/libraries/YarpPlugins/CanBusFake/CMakeLists.txt index 1b5130ea7..3fe37987e 100644 --- a/libraries/YarpPlugins/CanBusFake/CMakeLists.txt +++ b/libraries/YarpPlugins/CanBusFake/CMakeLists.txt @@ -16,10 +16,9 @@ yarp_add_plugin(CanBusFake CanBusFake.cpp CanBusFake.hpp DeviceDriverImpl.cpp) -add_dependencies(CanBusFake COLOR_DEBUG) - target_link_libraries(CanBusFake YARP::YARP_OS YARP::YARP_dev + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces) yarp_install(TARGETS CanBusFake diff --git a/libraries/YarpPlugins/CanBusFake/CanBusFake.hpp b/libraries/YarpPlugins/CanBusFake/CanBusFake.hpp index 41b43f799..ba872d703 100644 --- a/libraries/YarpPlugins/CanBusFake/CanBusFake.hpp +++ b/libraries/YarpPlugins/CanBusFake/CanBusFake.hpp @@ -8,7 +8,7 @@ #include "ICanBusHico.h" -#include "ColorDebug.hpp" +#include "ColorDebug.h" namespace roboticslab { diff --git a/libraries/YarpPlugins/CanBusHico/CMakeLists.txt b/libraries/YarpPlugins/CanBusHico/CMakeLists.txt index bc5a4797c..a0a19d4c2 100644 --- a/libraries/YarpPlugins/CanBusHico/CMakeLists.txt +++ b/libraries/YarpPlugins/CanBusHico/CMakeLists.txt @@ -18,10 +18,9 @@ yarp_add_plugin(CanBusHico CanBusHico.cpp hico_api.h DeviceDriverImpl.cpp) -add_dependencies(CanBusHico COLOR_DEBUG) - target_link_libraries(CanBusHico YARP::YARP_OS YARP::YARP_dev + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces) yarp_install(TARGETS CanBusHico diff --git a/libraries/YarpPlugins/CanBusHico/CanBusHico.hpp b/libraries/YarpPlugins/CanBusHico/CanBusHico.hpp index f44f9bee1..38b64dcfb 100644 --- a/libraries/YarpPlugins/CanBusHico/CanBusHico.hpp +++ b/libraries/YarpPlugins/CanBusHico/CanBusHico.hpp @@ -17,7 +17,7 @@ #include "ICanBusHico.h" -#include "ColorDebug.hpp" +#include "ColorDebug.h" namespace roboticslab { diff --git a/libraries/YarpPlugins/CuiAbsolute/CMakeLists.txt b/libraries/YarpPlugins/CuiAbsolute/CMakeLists.txt index d101b8e45..0e729e624 100644 --- a/libraries/YarpPlugins/CuiAbsolute/CMakeLists.txt +++ b/libraries/YarpPlugins/CuiAbsolute/CMakeLists.txt @@ -26,10 +26,9 @@ yarp_add_plugin(CuiAbsolute CuiAbsolute.cpp ITorqueControlRawImpl.cpp IVelocityControl2RawImpl.cpp) -add_dependencies(CuiAbsolute COLOR_DEBUG) - target_link_libraries(CuiAbsolute YARP::YARP_OS YARP::YARP_dev + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces) # Hack, fool CMake to think that YARP already switched to 3.0 while still at devel. diff --git a/libraries/YarpPlugins/CuiAbsolute/CuiAbsolute.hpp b/libraries/YarpPlugins/CuiAbsolute/CuiAbsolute.hpp index 9666c953a..62e570829 100644 --- a/libraries/YarpPlugins/CuiAbsolute/CuiAbsolute.hpp +++ b/libraries/YarpPlugins/CuiAbsolute/CuiAbsolute.hpp @@ -16,7 +16,7 @@ //#define CD_HIDE_INFO //-- Can be globally managed from father CMake. //#define CD_HIDE_WARNING //-- Can be globally managed from father CMake. //#define CD_HIDE_ERROR //-- Can be globally managed from father CMake. -#include "ColorDebug.hpp" +#include "ColorDebug.h" #include "ICanBusSharer.h" #include "ICuiAbsolute.h" diff --git a/libraries/YarpPlugins/FakeControlboard/CMakeLists.txt b/libraries/YarpPlugins/FakeControlboard/CMakeLists.txt index 5e07be1ba..82ede0414 100644 --- a/libraries/YarpPlugins/FakeControlboard/CMakeLists.txt +++ b/libraries/YarpPlugins/FakeControlboard/CMakeLists.txt @@ -28,10 +28,9 @@ yarp_add_plugin(FakeControlboard FakeControlboard.hpp RateThreadImpl.cpp SharedArea.cpp) -add_dependencies(FakeControlboard COLOR_DEBUG) - target_link_libraries(FakeControlboard YARP::YARP_OS YARP::YARP_dev + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces) yarp_install(TARGETS FakeControlboard diff --git a/libraries/YarpPlugins/FakeControlboard/DeviceDriverImpl.cpp b/libraries/YarpPlugins/FakeControlboard/DeviceDriverImpl.cpp index 1570f2227..d7da231bc 100644 --- a/libraries/YarpPlugins/FakeControlboard/DeviceDriverImpl.cpp +++ b/libraries/YarpPlugins/FakeControlboard/DeviceDriverImpl.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include // ------------------- DeviceDriver Related ------------------------------------ diff --git a/libraries/YarpPlugins/FakeControlboard/FakeControlboard.cpp b/libraries/YarpPlugins/FakeControlboard/FakeControlboard.cpp index 10cb1730d..d884f61af 100644 --- a/libraries/YarpPlugins/FakeControlboard/FakeControlboard.cpp +++ b/libraries/YarpPlugins/FakeControlboard/FakeControlboard.cpp @@ -2,7 +2,7 @@ #include "FakeControlboard.hpp" -#include +#include // ------------------- Miscellanea ------------------------------------ diff --git a/libraries/YarpPlugins/FakeControlboard/IControlLimits2Impl.cpp b/libraries/YarpPlugins/FakeControlboard/IControlLimits2Impl.cpp index 0071920dd..5bdbb67f4 100644 --- a/libraries/YarpPlugins/FakeControlboard/IControlLimits2Impl.cpp +++ b/libraries/YarpPlugins/FakeControlboard/IControlLimits2Impl.cpp @@ -2,7 +2,7 @@ #include "FakeControlboard.hpp" -#include +#include // ------------------- IControlLimits2 Related ------------------------------------ diff --git a/libraries/YarpPlugins/FakeControlboard/IControlLimitsImpl.cpp b/libraries/YarpPlugins/FakeControlboard/IControlLimitsImpl.cpp index a5aef7e04..0439706f3 100644 --- a/libraries/YarpPlugins/FakeControlboard/IControlLimitsImpl.cpp +++ b/libraries/YarpPlugins/FakeControlboard/IControlLimitsImpl.cpp @@ -2,7 +2,7 @@ #include "FakeControlboard.hpp" -#include +#include // ------------------- IControlLimits Related ------------------------------------ diff --git a/libraries/YarpPlugins/FakeControlboard/IControlMode2Impl.cpp b/libraries/YarpPlugins/FakeControlboard/IControlMode2Impl.cpp index a6ecda605..671c4fd0d 100644 --- a/libraries/YarpPlugins/FakeControlboard/IControlMode2Impl.cpp +++ b/libraries/YarpPlugins/FakeControlboard/IControlMode2Impl.cpp @@ -2,7 +2,7 @@ #include "FakeControlboard.hpp" -#include +#include // ------------------- IControlMode2 Related ------------------------------------ diff --git a/libraries/YarpPlugins/FakeControlboard/IControlModeImpl.cpp b/libraries/YarpPlugins/FakeControlboard/IControlModeImpl.cpp index 9197f470a..7a9515b41 100644 --- a/libraries/YarpPlugins/FakeControlboard/IControlModeImpl.cpp +++ b/libraries/YarpPlugins/FakeControlboard/IControlModeImpl.cpp @@ -2,7 +2,7 @@ #include "FakeControlboard.hpp" -#include +#include // ------------------- IControlMode Related ------------------------------------ diff --git a/libraries/YarpPlugins/FakeControlboard/IPositionControl2Impl.cpp b/libraries/YarpPlugins/FakeControlboard/IPositionControl2Impl.cpp index b4ae77977..6cd90bfe5 100644 --- a/libraries/YarpPlugins/FakeControlboard/IPositionControl2Impl.cpp +++ b/libraries/YarpPlugins/FakeControlboard/IPositionControl2Impl.cpp @@ -2,7 +2,7 @@ #include "FakeControlboard.hpp" -#include +#include // ------------------- IPositionControl2 Related -------------------------------- diff --git a/libraries/YarpPlugins/FakeControlboard/IPositionControlImpl.cpp b/libraries/YarpPlugins/FakeControlboard/IPositionControlImpl.cpp index 2cd513b10..5966f4d9b 100644 --- a/libraries/YarpPlugins/FakeControlboard/IPositionControlImpl.cpp +++ b/libraries/YarpPlugins/FakeControlboard/IPositionControlImpl.cpp @@ -3,7 +3,7 @@ #include "FakeControlboard.hpp" #include -#include +#include // ------------------- IPositionControl Related -------------------------------- diff --git a/libraries/YarpPlugins/FakeControlboard/ITorqueControlImpl.cpp b/libraries/YarpPlugins/FakeControlboard/ITorqueControlImpl.cpp index 780373785..40ea510d3 100644 --- a/libraries/YarpPlugins/FakeControlboard/ITorqueControlImpl.cpp +++ b/libraries/YarpPlugins/FakeControlboard/ITorqueControlImpl.cpp @@ -2,7 +2,7 @@ #include "FakeControlboard.hpp" -#include +#include // ------------------- IForceControl Related ------------------------------------ diff --git a/libraries/YarpPlugins/FakeControlboard/IVelocityControl2Impl.cpp b/libraries/YarpPlugins/FakeControlboard/IVelocityControl2Impl.cpp index 48b19d108..48245502e 100644 --- a/libraries/YarpPlugins/FakeControlboard/IVelocityControl2Impl.cpp +++ b/libraries/YarpPlugins/FakeControlboard/IVelocityControl2Impl.cpp @@ -2,7 +2,7 @@ #include "FakeControlboard.hpp" -#include +#include // ------------------ IVelocity2 Related ---------------------------------------- diff --git a/libraries/YarpPlugins/FakeControlboard/IVelocityControlImpl.cpp b/libraries/YarpPlugins/FakeControlboard/IVelocityControlImpl.cpp index eb8b6b29f..b6f202d48 100644 --- a/libraries/YarpPlugins/FakeControlboard/IVelocityControlImpl.cpp +++ b/libraries/YarpPlugins/FakeControlboard/IVelocityControlImpl.cpp @@ -2,7 +2,7 @@ #include "FakeControlboard.hpp" -#include +#include // ------------------ IVelocity Related ---------------------------------------- diff --git a/libraries/YarpPlugins/FakeControlboard/RateThreadImpl.cpp b/libraries/YarpPlugins/FakeControlboard/RateThreadImpl.cpp index 35a10aa81..ae1074a53 100644 --- a/libraries/YarpPlugins/FakeControlboard/RateThreadImpl.cpp +++ b/libraries/YarpPlugins/FakeControlboard/RateThreadImpl.cpp @@ -4,7 +4,7 @@ #include -#include +#include // ------------------- RateThread Related ------------------------------------ diff --git a/libraries/YarpPlugins/FakeJoint/CMakeLists.txt b/libraries/YarpPlugins/FakeJoint/CMakeLists.txt index 2a10d01b0..ac16de33a 100644 --- a/libraries/YarpPlugins/FakeJoint/CMakeLists.txt +++ b/libraries/YarpPlugins/FakeJoint/CMakeLists.txt @@ -26,10 +26,9 @@ yarp_add_plugin(FakeJoint FakeJoint.cpp ITorqueControlRawImpl.cpp IVelocityControl2RawImpl.cpp) -add_dependencies(FakeJoint COLOR_DEBUG) - target_link_libraries(FakeJoint YARP::YARP_OS YARP::YARP_dev + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces) # Hack, fool CMake to think that YARP already switched to 3.0 while still at devel. diff --git a/libraries/YarpPlugins/FakeJoint/FakeJoint.hpp b/libraries/YarpPlugins/FakeJoint/FakeJoint.hpp index 7ebcf05ab..4648aceef 100644 --- a/libraries/YarpPlugins/FakeJoint/FakeJoint.hpp +++ b/libraries/YarpPlugins/FakeJoint/FakeJoint.hpp @@ -15,7 +15,7 @@ //#define CD_HIDE_INFO //-- Can be globally managed from father CMake. //#define CD_HIDE_WARNING //-- Can be globally managed from father CMake. //#define CD_HIDE_ERROR //-- Can be globally managed from father CMake. -#include "ColorDebug.hpp" +#include "ColorDebug.h" #include "ICanBusSharer.h" diff --git a/libraries/YarpPlugins/Jr3/CMakeLists.txt b/libraries/YarpPlugins/Jr3/CMakeLists.txt index c71f808f6..63c0e865e 100644 --- a/libraries/YarpPlugins/Jr3/CMakeLists.txt +++ b/libraries/YarpPlugins/Jr3/CMakeLists.txt @@ -18,10 +18,9 @@ yarp_add_plugin(Jr3 Jr3.hpp DeviceDriverImpl.cpp IAnalogSensorImpl.cpp) -add_dependencies(Jr3 COLOR_DEBUG) - target_link_libraries(Jr3 YARP::YARP_OS YARP::YARP_dev + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces) yarp_install(TARGETS Jr3 diff --git a/libraries/YarpPlugins/Jr3/Jr3.hpp b/libraries/YarpPlugins/Jr3/Jr3.hpp index 6672c5c86..1f1323a43 100644 --- a/libraries/YarpPlugins/Jr3/Jr3.hpp +++ b/libraries/YarpPlugins/Jr3/Jr3.hpp @@ -19,7 +19,7 @@ //#define CD_HIDE_INFO //-- Can be globally managed from father CMake. //#define CD_HIDE_WARNING //-- Can be globally managed from father CMake. //#define CD_HIDE_ERROR //-- Can be globally managed from father CMake. -#include "ColorDebug.hpp" +#include "ColorDebug.h" #include "ICanBusSharer.h" #define DEFAULT_NUM_CHANNELS 24 diff --git a/libraries/YarpPlugins/LacqueyFetch/CMakeLists.txt b/libraries/YarpPlugins/LacqueyFetch/CMakeLists.txt index e8bc3bf1d..92e838131 100644 --- a/libraries/YarpPlugins/LacqueyFetch/CMakeLists.txt +++ b/libraries/YarpPlugins/LacqueyFetch/CMakeLists.txt @@ -26,10 +26,9 @@ yarp_add_plugin(LacqueyFetch LacqueyFetch.cpp ITorqueControlRawImpl.cpp IVelocityControl2RawImpl.cpp) -add_dependencies(LacqueyFetch COLOR_DEBUG) - target_link_libraries(LacqueyFetch YARP::YARP_OS YARP::YARP_dev + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces) # Hack, fool CMake to think that YARP already switched to 3.0 while still at devel. diff --git a/libraries/YarpPlugins/LacqueyFetch/LacqueyFetch.hpp b/libraries/YarpPlugins/LacqueyFetch/LacqueyFetch.hpp index b2f32af96..832e24708 100644 --- a/libraries/YarpPlugins/LacqueyFetch/LacqueyFetch.hpp +++ b/libraries/YarpPlugins/LacqueyFetch/LacqueyFetch.hpp @@ -15,7 +15,7 @@ //#define CD_HIDE_INFO //-- Can be globally managed from father CMake. //#define CD_HIDE_WARNING //-- Can be globally managed from father CMake. //#define CD_HIDE_ERROR //-- Can be globally managed from father CMake. -#include "ColorDebug.hpp" +#include "ColorDebug.h" #include "ICanBusSharer.h" diff --git a/libraries/YarpPlugins/LeapMotionSensor/CMakeLists.txt b/libraries/YarpPlugins/LeapMotionSensor/CMakeLists.txt index 9bf08f232..f354c44d7 100644 --- a/libraries/YarpPlugins/LeapMotionSensor/CMakeLists.txt +++ b/libraries/YarpPlugins/LeapMotionSensor/CMakeLists.txt @@ -23,12 +23,11 @@ if(NOT SKIP_LeapMotionSensor) DeviceDriverImpl.cpp IAnalogSensorImpl.cpp) - add_dependencies(LeapMotionSensor COLOR_DEBUG) - target_link_libraries(LeapMotionSensor YARP::YARP_OS YARP::YARP_dev YARP::YARP_sig - ${Leap_LIBRARY}) + ${Leap_LIBRARY} + ROBOTICSLAB::ColorDebug) yarp_install(TARGETS LeapMotionSensor COMPONENT runtime diff --git a/libraries/YarpPlugins/LeapMotionSensor/DeviceDriverImpl.cpp b/libraries/YarpPlugins/LeapMotionSensor/DeviceDriverImpl.cpp index 4df588780..a8783e1c3 100644 --- a/libraries/YarpPlugins/LeapMotionSensor/DeviceDriverImpl.cpp +++ b/libraries/YarpPlugins/LeapMotionSensor/DeviceDriverImpl.cpp @@ -4,7 +4,7 @@ #include -#include "ColorDebug.hpp" +#include "ColorDebug.h" // ----------------------------------------------------------------------------- diff --git a/libraries/YarpPlugins/LeapMotionSensor/IAnalogSensorImpl.cpp b/libraries/YarpPlugins/LeapMotionSensor/IAnalogSensorImpl.cpp index 921974ef5..57d83462d 100644 --- a/libraries/YarpPlugins/LeapMotionSensor/IAnalogSensorImpl.cpp +++ b/libraries/YarpPlugins/LeapMotionSensor/IAnalogSensorImpl.cpp @@ -4,7 +4,7 @@ #include -#include "ColorDebug.hpp" +#include "ColorDebug.h" namespace { diff --git a/libraries/YarpPlugins/ProximitySensorsClient/CMakeLists.txt b/libraries/YarpPlugins/ProximitySensorsClient/CMakeLists.txt index 444a8b7d1..583fed6da 100644 --- a/libraries/YarpPlugins/ProximitySensorsClient/CMakeLists.txt +++ b/libraries/YarpPlugins/ProximitySensorsClient/CMakeLists.txt @@ -17,10 +17,9 @@ yarp_add_plugin(ProximitySensorsClient ProximitySensorsClient.hpp DeviceDriverImpl.cpp IProximitySensorsImpl.cpp) -add_dependencies(ProximitySensorsClient COLOR_DEBUG) - target_link_libraries(ProximitySensorsClient YARP::YARP_OS YARP::YARP_dev + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces) yarp_install(TARGETS ProximitySensorsClient diff --git a/libraries/YarpPlugins/ProximitySensorsClient/DeviceDriverImpl.cpp b/libraries/YarpPlugins/ProximitySensorsClient/DeviceDriverImpl.cpp index 618f39eda..60f01a00d 100644 --- a/libraries/YarpPlugins/ProximitySensorsClient/DeviceDriverImpl.cpp +++ b/libraries/YarpPlugins/ProximitySensorsClient/DeviceDriverImpl.cpp @@ -7,7 +7,7 @@ #include -#include +#include // ------------------- DeviceDriver Related ------------------------------------ diff --git a/libraries/YarpPlugins/ProximitySensorsClient/IProximitySensorsImpl.cpp b/libraries/YarpPlugins/ProximitySensorsClient/IProximitySensorsImpl.cpp index c475c9010..5a4fe113d 100644 --- a/libraries/YarpPlugins/ProximitySensorsClient/IProximitySensorsImpl.cpp +++ b/libraries/YarpPlugins/ProximitySensorsClient/IProximitySensorsImpl.cpp @@ -2,7 +2,7 @@ #include "ProximitySensorsClient.hpp" -#include +#include roboticslab::IProximitySensors::alert_level roboticslab::ProximitySensorsClient::getAlertLevel() { diff --git a/libraries/YarpPlugins/ProximitySensorsClient/ProximitySensorsClient.cpp b/libraries/YarpPlugins/ProximitySensorsClient/ProximitySensorsClient.cpp index 3a2ba08f8..e97eed1f6 100644 --- a/libraries/YarpPlugins/ProximitySensorsClient/ProximitySensorsClient.cpp +++ b/libraries/YarpPlugins/ProximitySensorsClient/ProximitySensorsClient.cpp @@ -2,7 +2,7 @@ #include "ProximitySensorsClient.hpp" -#include +#include void roboticslab::ProximitySensorsClient::SensorReader::onRead(yarp::os::Bottle& b) { diff --git a/libraries/YarpPlugins/SpaceNavigator/CMakeLists.txt b/libraries/YarpPlugins/SpaceNavigator/CMakeLists.txt index 53dc59aa8..bbfeea31e 100644 --- a/libraries/YarpPlugins/SpaceNavigator/CMakeLists.txt +++ b/libraries/YarpPlugins/SpaceNavigator/CMakeLists.txt @@ -24,10 +24,9 @@ if(NOT SKIP_SpaceNavigator) DeviceDriverImpl.cpp IAnalogSensorImpl.cpp) - add_dependencies(SpaceNavigator COLOR_DEBUG) - target_link_libraries(SpaceNavigator YARP::YARP_dev ${SPNAV_LIBRARIES} + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces) yarp_install(TARGETS SpaceNavigator diff --git a/libraries/YarpPlugins/SpaceNavigator/SpaceNavigator.hpp b/libraries/YarpPlugins/SpaceNavigator/SpaceNavigator.hpp index ee7c8f254..6fa331d68 100644 --- a/libraries/YarpPlugins/SpaceNavigator/SpaceNavigator.hpp +++ b/libraries/YarpPlugins/SpaceNavigator/SpaceNavigator.hpp @@ -6,7 +6,7 @@ #include #include -#include "ColorDebug.hpp" +#include "ColorDebug.h" #define DEFAULT_NUM_CHANNELS 8 diff --git a/libraries/YarpPlugins/TechnosoftIpos/CMakeLists.txt b/libraries/YarpPlugins/TechnosoftIpos/CMakeLists.txt index 7ab53e0a2..36c9a9cf4 100644 --- a/libraries/YarpPlugins/TechnosoftIpos/CMakeLists.txt +++ b/libraries/YarpPlugins/TechnosoftIpos/CMakeLists.txt @@ -26,10 +26,9 @@ yarp_add_plugin(TechnosoftIpos TechnosoftIpos.cpp ITorqueControlRawImpl.cpp IVelocityControl2RawImpl.cpp) -add_dependencies(TechnosoftIpos COLOR_DEBUG) - target_link_libraries(TechnosoftIpos YARP::YARP_OS YARP::YARP_dev + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces) # Hack, fool CMake to think that YARP already switched to 3.0 while still at devel. diff --git a/libraries/YarpPlugins/TechnosoftIpos/TechnosoftIpos.hpp b/libraries/YarpPlugins/TechnosoftIpos/TechnosoftIpos.hpp index de0473932..130bd26ae 100644 --- a/libraries/YarpPlugins/TechnosoftIpos/TechnosoftIpos.hpp +++ b/libraries/YarpPlugins/TechnosoftIpos/TechnosoftIpos.hpp @@ -15,7 +15,7 @@ //#define CD_HIDE_INFO //-- Can be globally managed from father CMake. //#define CD_HIDE_WARNING //-- Can be globally managed from father CMake. //#define CD_HIDE_ERROR //-- Can be globally managed from father CMake. -#include "ColorDebug.hpp" +#include "ColorDebug.h" #include "ICanBusSharer.h" #include "ITechnosoftIpos.h" diff --git a/libraries/YarpPlugins/TextilesHand/CMakeLists.txt b/libraries/YarpPlugins/TextilesHand/CMakeLists.txt index 978d65b7e..eff7f6704 100644 --- a/libraries/YarpPlugins/TextilesHand/CMakeLists.txt +++ b/libraries/YarpPlugins/TextilesHand/CMakeLists.txt @@ -27,10 +27,9 @@ yarp_add_plugin(TextilesHand TextilesHand.cpp ITorqueControlRawImpl.cpp IVelocityControl2RawImpl.cpp) -add_dependencies(TextilesHand COLOR_DEBUG) - target_link_libraries(TextilesHand YARP::YARP_OS YARP::YARP_dev + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces) # Hack, fool CMake to think that YARP already switched to 3.0 while still at devel. diff --git a/libraries/YarpPlugins/TextilesHand/TextilesHand.hpp b/libraries/YarpPlugins/TextilesHand/TextilesHand.hpp index 9d6abed4a..35dc2023b 100644 --- a/libraries/YarpPlugins/TextilesHand/TextilesHand.hpp +++ b/libraries/YarpPlugins/TextilesHand/TextilesHand.hpp @@ -26,7 +26,7 @@ //#define CD_HIDE_INFO //-- Can be globally managed from father CMake. //#define CD_HIDE_WARNING //-- Can be globally managed from father CMake. //#define CD_HIDE_ERROR //-- Can be globally managed from father CMake. -#include "ColorDebug.hpp" +#include "ColorDebug.h" #include "ICanBusSharer.h" diff --git a/libraries/YarpPlugins/WiimoteSensor/CMakeLists.txt b/libraries/YarpPlugins/WiimoteSensor/CMakeLists.txt index 40f15211a..b8f8e6efb 100644 --- a/libraries/YarpPlugins/WiimoteSensor/CMakeLists.txt +++ b/libraries/YarpPlugins/WiimoteSensor/CMakeLists.txt @@ -29,11 +29,10 @@ if(NOT SKIP_WiimoteSensor) IAnalogSensorImpl.cpp WiimoteDispatcherThread.cpp) - add_dependencies(WiimoteSensor COLOR_DEBUG) - target_link_libraries(WiimoteSensor YARP::YARP_OS YARP::YARP_dev XWiimote::XWiimote + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces) yarp_install(TARGETS WiimoteSensor diff --git a/libraries/YarpPlugins/WiimoteSensor/DeviceDriverImpl.cpp b/libraries/YarpPlugins/WiimoteSensor/DeviceDriverImpl.cpp index 5655c98e4..cc829460c 100644 --- a/libraries/YarpPlugins/WiimoteSensor/DeviceDriverImpl.cpp +++ b/libraries/YarpPlugins/WiimoteSensor/DeviceDriverImpl.cpp @@ -6,7 +6,7 @@ #include -#include "ColorDebug.hpp" +#include "ColorDebug.h" // ----------------------------------------------------------------------------- diff --git a/libraries/YarpPlugins/WiimoteSensor/IAnalogSensorImpl.cpp b/libraries/YarpPlugins/WiimoteSensor/IAnalogSensorImpl.cpp index 499dd36c6..dcfa94216 100644 --- a/libraries/YarpPlugins/WiimoteSensor/IAnalogSensorImpl.cpp +++ b/libraries/YarpPlugins/WiimoteSensor/IAnalogSensorImpl.cpp @@ -2,7 +2,7 @@ #include "WiimoteSensor.hpp" -#include "ColorDebug.hpp" +#include "ColorDebug.h" namespace { diff --git a/libraries/YarpPlugins/WiimoteSensor/WiimoteDispatcherThread.cpp b/libraries/YarpPlugins/WiimoteSensor/WiimoteDispatcherThread.cpp index 1e3164099..84471edb7 100644 --- a/libraries/YarpPlugins/WiimoteSensor/WiimoteDispatcherThread.cpp +++ b/libraries/YarpPlugins/WiimoteSensor/WiimoteDispatcherThread.cpp @@ -7,7 +7,7 @@ #include #include -#include "ColorDebug.hpp" +#include "ColorDebug.h" namespace { diff --git a/libraries/YarpPlugins/WiimoteSensor/WiimoteSensor.cpp b/libraries/YarpPlugins/WiimoteSensor/WiimoteSensor.cpp index b16157e1e..89c62eb4e 100644 --- a/libraries/YarpPlugins/WiimoteSensor/WiimoteSensor.cpp +++ b/libraries/YarpPlugins/WiimoteSensor/WiimoteSensor.cpp @@ -4,7 +4,7 @@ #include -#include "ColorDebug.hpp" +#include "ColorDebug.h" // ----------------------------------------------------------------------------- diff --git a/programs/checkCanBus/CMakeLists.txt b/programs/checkCanBus/CMakeLists.txt index 97e0282f8..a6bbd120f 100644 --- a/programs/checkCanBus/CMakeLists.txt +++ b/programs/checkCanBus/CMakeLists.txt @@ -7,11 +7,10 @@ add_executable(checkCanBus main.cpp CheckCanBus.hpp ThreadImpl.cpp) -add_dependencies(checkCanBus COLOR_DEBUG) - target_link_libraries(checkCanBus YARP::YARP_OS YARP::YARP_init YARP::YARP_dev + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces) install(TARGETS checkCanBus diff --git a/programs/checkCanBus/CheckCanBus.cpp b/programs/checkCanBus/CheckCanBus.cpp index d926edf07..b2236f93e 100644 --- a/programs/checkCanBus/CheckCanBus.cpp +++ b/programs/checkCanBus/CheckCanBus.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include namespace roboticslab { diff --git a/programs/checkCanBus/ThreadImpl.cpp b/programs/checkCanBus/ThreadImpl.cpp index 453092eba..1a063c0ab 100644 --- a/programs/checkCanBus/ThreadImpl.cpp +++ b/programs/checkCanBus/ThreadImpl.cpp @@ -5,7 +5,7 @@ #include -#include +#include // ------------------ Thread Related ----------------------------------------- diff --git a/programs/checkCanBus/main.cpp b/programs/checkCanBus/main.cpp index 48e0789f7..772f9e52a 100644 --- a/programs/checkCanBus/main.cpp +++ b/programs/checkCanBus/main.cpp @@ -53,7 +53,7 @@ Example of uses: #include #include -#include +#include #include "CheckCanBus.hpp" diff --git a/programs/dumpCanBus/CMakeLists.txt b/programs/dumpCanBus/CMakeLists.txt index 484ac50bf..de4ca183f 100644 --- a/programs/dumpCanBus/CMakeLists.txt +++ b/programs/dumpCanBus/CMakeLists.txt @@ -7,11 +7,10 @@ add_executable(dumpCanBus main.cpp DumpCanBus.hpp ThreadImpl.cpp) -add_dependencies(dumpCanBus COLOR_DEBUG) - target_link_libraries(dumpCanBus YARP::YARP_OS YARP::YARP_init YARP::YARP_dev + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces) install(TARGETS dumpCanBus diff --git a/programs/dumpCanBus/DumpCanBus.cpp b/programs/dumpCanBus/DumpCanBus.cpp index e6a3693b3..0ca5077e1 100644 --- a/programs/dumpCanBus/DumpCanBus.cpp +++ b/programs/dumpCanBus/DumpCanBus.cpp @@ -8,7 +8,7 @@ #include -#include +#include namespace roboticslab { diff --git a/programs/dumpCanBus/ThreadImpl.cpp b/programs/dumpCanBus/ThreadImpl.cpp index b6019ac52..0c241cbe3 100644 --- a/programs/dumpCanBus/ThreadImpl.cpp +++ b/programs/dumpCanBus/ThreadImpl.cpp @@ -3,7 +3,7 @@ #include "DumpCanBus.hpp" #include "hico_api.h" -#include +#include // ------------------ Thread Related ----------------------------------------- diff --git a/programs/dumpCanBus/main.cpp b/programs/dumpCanBus/main.cpp index 53eec7bc2..3510b6f56 100644 --- a/programs/dumpCanBus/main.cpp +++ b/programs/dumpCanBus/main.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include #include "DumpCanBus.hpp" diff --git a/programs/launchLocomotion/CMakeLists.txt b/programs/launchLocomotion/CMakeLists.txt index a80c06d6f..12707d5d2 100644 --- a/programs/launchLocomotion/CMakeLists.txt +++ b/programs/launchLocomotion/CMakeLists.txt @@ -5,10 +5,9 @@ if(ENABLE_launchLocomotion) add_executable(launchLocomotion main.cpp) -add_dependencies(launchLocomotion COLOR_DEBUG) - target_link_libraries(launchLocomotion YARP::YARP_OS YARP::YARP_init + ROBOTICSLAB::ColorDebug TwoCanBusThreeWrappers) install(TARGETS launchLocomotion diff --git a/programs/launchLocomotion/main.cpp b/programs/launchLocomotion/main.cpp index a83eb2ecb..edda0b912 100644 --- a/programs/launchLocomotion/main.cpp +++ b/programs/launchLocomotion/main.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include #include "TwoCanBusThreeWrappers.hpp" diff --git a/programs/launchManipulation/CMakeLists.txt b/programs/launchManipulation/CMakeLists.txt index f992bf351..8cf21f656 100644 --- a/programs/launchManipulation/CMakeLists.txt +++ b/programs/launchManipulation/CMakeLists.txt @@ -5,10 +5,9 @@ if(ENABLE_launchManipulation) add_executable(launchManipulation main.cpp) -add_dependencies(launchManipulation COLOR_DEBUG) - target_link_libraries(launchManipulation YARP::YARP_OS YARP::YARP_init + ROBOTICSLAB::ColorDebug TwoCanBusThreeWrappers) install(TARGETS launchManipulation diff --git a/programs/launchManipulation/main.cpp b/programs/launchManipulation/main.cpp index ce7a259e8..d7140e081 100644 --- a/programs/launchManipulation/main.cpp +++ b/programs/launchManipulation/main.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include #include "TwoCanBusThreeWrappers.hpp" diff --git a/programs/oneCanBusOneWrapper/CMakeLists.txt b/programs/oneCanBusOneWrapper/CMakeLists.txt index d3723c1a6..4eaa88a83 100644 --- a/programs/oneCanBusOneWrapper/CMakeLists.txt +++ b/programs/oneCanBusOneWrapper/CMakeLists.txt @@ -5,10 +5,9 @@ if(ENABLE_oneCanBusOneWrapper) add_executable(oneCanBusOneWrapper main.cpp) -add_dependencies(oneCanBusOneWrapper COLOR_DEBUG) - target_link_libraries(oneCanBusOneWrapper YARP::YARP_OS YARP::YARP_init + ROBOTICSLAB::ColorDebug OneCanBusOneWrapper) install(TARGETS oneCanBusOneWrapper diff --git a/programs/oneCanBusOneWrapper/main.cpp b/programs/oneCanBusOneWrapper/main.cpp index 700320917..943cc998a 100644 --- a/programs/oneCanBusOneWrapper/main.cpp +++ b/programs/oneCanBusOneWrapper/main.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include #include "OneCanBusOneWrapper.hpp" diff --git a/tests/testCuiAbsolute/CMakeLists.txt b/tests/testCuiAbsolute/CMakeLists.txt index 2f524f06f..380cee9bb 100644 --- a/tests/testCuiAbsolute/CMakeLists.txt +++ b/tests/testCuiAbsolute/CMakeLists.txt @@ -1,9 +1,8 @@ add_executable(testCuiAbsolute testCuiAbsolute.cpp) -add_dependencies(testCuiAbsolute COLOR_DEBUG) - target_link_libraries(testCuiAbsolute YARP::YARP_OS YARP::YARP_dev + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces gtest gtest_main) diff --git a/tests/testCuiAbsolute/testCuiAbsolute.cpp b/tests/testCuiAbsolute/testCuiAbsolute.cpp index 115e5b93a..0b176cfaf 100644 --- a/tests/testCuiAbsolute/testCuiAbsolute.cpp +++ b/tests/testCuiAbsolute/testCuiAbsolute.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include "ICanBusSharer.h" #include "ICuiAbsolute.h" diff --git a/tests/testTechnosoftIpos/CMakeLists.txt b/tests/testTechnosoftIpos/CMakeLists.txt index ce215f5d2..914a1883d 100644 --- a/tests/testTechnosoftIpos/CMakeLists.txt +++ b/tests/testTechnosoftIpos/CMakeLists.txt @@ -1,9 +1,8 @@ add_executable(testTechnosoftIpos testTechnosoftIpos.cpp) -add_dependencies(testTechnosoftIpos COLOR_DEBUG) - target_link_libraries(testTechnosoftIpos YARP::YARP_OS YARP::YARP_dev + ROBOTICSLAB::ColorDebug YarpDevicesInterfaces gtest gtest_main) diff --git a/tests/testTechnosoftIpos/testTechnosoftIpos.cpp b/tests/testTechnosoftIpos/testTechnosoftIpos.cpp index f01d43c71..ac1915c4b 100644 --- a/tests/testTechnosoftIpos/testTechnosoftIpos.cpp +++ b/tests/testTechnosoftIpos/testTechnosoftIpos.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include "ICanBusSharer.h" #include "ITechnosoftIpos.h"