From be15fd13141830dd61725ffe178efb8a909b2748 Mon Sep 17 00:00:00 2001 From: "Daniele E. Domenichelli" Date: Wed, 18 Dec 2019 16:19:51 +0100 Subject: [PATCH] YarpPlugin: do not require CMAKE_INCLUDE_CURRENT_DIR * Including current directory (either explicitly, or using `CMAKE_INCLUDE_CURRENT_DIR`) is no longer required by the generated files. * `INCLUDE` must now be an existing file, either using a path relative to current directory, or an absolute path. Using a path relative to one of the include directories is deprecated. --- cmake/YarpPlugin.cmake | 14 ++++++++++++++ doc/release/master/YarpPlugin_absolute.md | 12 ++++++++++++ example/externaldevices/baz/bazBot/CMakeLists.txt | 2 -- .../externaldevices/baz/bazDevice/CMakeLists.txt | 2 -- example/externaldevices/foo/fooBot/CMakeLists.txt | 2 -- .../externaldevices/foo/fooDevice/CMakeLists.txt | 2 -- example/portmonitor/ascii_image/CMakeLists.txt | 2 -- example/portmonitor/simple_dll/CMakeLists.txt | 2 -- src/carriers/bayer_carrier/CMakeLists.txt | 2 -- .../depth_image_portmonitor/CMakeLists.txt | 2 -- src/carriers/h264_carrier/CMakeLists.txt | 2 -- src/carriers/human_carrier/CMakeLists.txt | 2 -- src/carriers/mjpeg_carrier/CMakeLists.txt | 2 -- src/carriers/mpi_carrier/CMakeLists.txt | 4 ---- src/carriers/portmonitor_carrier/CMakeLists.txt | 6 ++---- .../portmonitor_carrier/dll/MonitorSharedLib.h | 8 ++++---- src/carriers/priority_carrier/CMakeLists.txt | 2 -- src/carriers/shmem_carrier/CMakeLists.txt | 2 -- src/carriers/tcpros_carrier/CMakeLists.txt | 2 -- src/carriers/xmlrpc_carrier/CMakeLists.txt | 2 -- src/carriers/zfp_portmonitor/CMakeLists.txt | 2 -- src/carriers/zfp_portmonitor/zfpPortmonitor.cpp | 4 +++- src/devices/AnalogSensorClient/CMakeLists.txt | 2 -- src/devices/AnalogWrapper/CMakeLists.txt | 2 -- src/devices/ControlBoardRemapper/CMakeLists.txt | 2 -- src/devices/ControlBoardWrapper/CMakeLists.txt | 2 -- src/devices/DeviceGroup/CMakeLists.txt | 2 -- src/devices/DevicePipe/CMakeLists.txt | 2 -- src/devices/DynamixelAX12Ftdi/CMakeLists.txt | 2 -- src/devices/JoypadControlClient/CMakeLists.txt | 2 -- src/devices/JoypadControlServer/CMakeLists.txt | 2 -- src/devices/RGBDSensorClient/CMakeLists.txt | 2 -- src/devices/RGBDSensorWrapper/CMakeLists.txt | 2 -- src/devices/Rangefinder2DClient/CMakeLists.txt | 2 -- src/devices/Rangefinder2DWrapper/CMakeLists.txt | 2 -- src/devices/RemoteControlBoard/CMakeLists.txt | 2 -- src/devices/RemoteFrameGrabber/CMakeLists.txt | 2 -- src/devices/RobotDescriptionClient/CMakeLists.txt | 2 -- src/devices/RobotDescriptionServer/CMakeLists.txt | 2 -- src/devices/SDLJoypad/CMakeLists.txt | 2 -- src/devices/SerialServoBoard/CMakeLists.txt | 2 -- src/devices/ServerFrameGrabber/CMakeLists.txt | 2 -- src/devices/ServerGrabber/CMakeLists.txt | 2 -- src/devices/ServerInertial/CMakeLists.txt | 2 -- src/devices/ServerSerial/CMakeLists.txt | 2 -- src/devices/ServerSoundGrabber/CMakeLists.txt | 2 -- src/devices/TestMotor/CMakeLists.txt | 2 -- src/devices/VirtualAnalogWrapper/CMakeLists.txt | 2 -- src/devices/audioPlayerWrapper/CMakeLists.txt | 2 -- .../audioRecorderWrapper/AudioRecorderWrapper.cpp | 2 +- src/devices/audioRecorderWrapper/CMakeLists.txt | 2 -- src/devices/batteryClient/CMakeLists.txt | 2 -- src/devices/batteryWrapper/CMakeLists.txt | 2 -- src/devices/depthCamera/CMakeLists.txt | 2 -- src/devices/fakeAnalogSensor/CMakeLists.txt | 2 -- src/devices/fakeAnalogSensor/fakeAnalogSensor.cpp | 3 +-- src/devices/fakeBattery/CMakeLists.txt | 2 -- src/devices/fakeDepthCamera/CMakeLists.txt | 2 -- src/devices/fakeIMU/CMakeLists.txt | 2 -- src/devices/fakeIMU/fakeIMU.cpp | 5 +++-- src/devices/fakeLaser/CMakeLists.txt | 2 -- src/devices/fakeLocalizerDevice/CMakeLists.txt | 2 -- src/devices/fakeMicrophone/CMakeLists.txt | 2 -- src/devices/fakeMotionControl/CMakeLists.txt | 2 -- src/devices/fakeNavigationDevice/CMakeLists.txt | 2 -- src/devices/fakeSpeaker/CMakeLists.txt | 2 -- src/devices/fakeSpeaker/fakeSpeaker.cpp | 4 ++-- src/devices/fakebot/CMakeLists.txt | 2 -- src/devices/ffmpeg/CMakeLists.txt | 1 - src/devices/ffmpeg/FfmpegGrabber.h | 2 +- src/devices/imuBosch_BNO055/CMakeLists.txt | 2 -- src/devices/laserFromDepth/CMakeLists.txt | 2 -- src/devices/laserFromDepth/laserFromDepth.cpp | 10 +++++----- src/devices/laserHokuyo/CMakeLists.txt | 2 -- src/devices/laserHokuyo/laserHokuyo.cpp | 9 +++++---- src/devices/localization2DClient/CMakeLists.txt | 2 -- src/devices/localization2DServer/CMakeLists.txt | 2 -- src/devices/map2DClient/CMakeLists.txt | 2 -- src/devices/map2DServer/CMakeLists.txt | 2 -- .../multipleanalogsensorsclient/CMakeLists.txt | 1 - .../multipleanalogsensorsremapper/CMakeLists.txt | 2 -- .../multipleanalogsensorsserver/CMakeLists.txt | 2 -- src/devices/navigation2DClient/CMakeLists.txt | 2 -- src/devices/navigation2DServer/CMakeLists.txt | 2 -- src/devices/opencv/CMakeLists.txt | 2 -- src/devices/opencv/OpenCVGrabber.cpp | 4 ++-- src/devices/opencv/OpenCVGrabber.h | 4 +--- src/devices/ovrheadset/CMakeLists.txt | 2 -- src/devices/portaudio/CMakeLists.txt | 2 -- src/devices/portaudio/PortAudioDeviceDriver.cpp | 2 +- src/devices/portaudioPlayer/CMakeLists.txt | 2 -- .../PortAudioPlayerDeviceDriver.cpp | 2 +- src/devices/portaudioRecorder/CMakeLists.txt | 2 -- .../PortAudioRecorderDeviceDriver.cpp | 2 +- src/devices/realsense2/CMakeLists.txt | 2 -- src/devices/rpLidar/CMakeLists.txt | 2 -- src/devices/rpLidar/rpLidar.cpp | 9 +++++---- src/devices/rpLidar2/CMakeLists.txt | 2 -- src/devices/rpLidar2/rpLidar2.cpp | 7 ++++--- src/devices/serialport/CMakeLists.txt | 2 -- src/devices/serialport/SerialDeviceDriver.cpp | 7 +++---- src/devices/test_grabber/CMakeLists.txt | 1 - src/devices/test_grabber/TestFrameGrabber.cpp | 6 +++--- src/devices/test_nop/CMakeLists.txt | 2 -- src/devices/test_segfault/CMakeLists.txt | 2 -- src/devices/transformClient/CMakeLists.txt | 2 -- src/devices/transformServer/CMakeLists.txt | 2 -- src/devices/usbCamera/CMakeLists.txt | 6 ++---- 108 files changed, 76 insertions(+), 223 deletions(-) create mode 100644 doc/release/master/YarpPlugin_absolute.md diff --git a/cmake/YarpPlugin.cmake b/cmake/YarpPlugin.cmake index adbb231f4b0..83f9f0bb376 100644 --- a/cmake/YarpPlugin.cmake +++ b/cmake/YarpPlugin.cmake @@ -277,6 +277,20 @@ macro(YARP_PREPARE_PLUGIN _plugin_name) endif() endif() + if(NOT IS_ABSOLUTE "${_YPP_INCLUDE}") + if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_YPP_INCLUDE}") + # DEPRECATED Since YARP 3.4 + message(DEPRECATION "${CMAKE_CURRENT_SOURCE_DIR}/The file \"${_YPP_INCLUDE}\" does not exist. This will not be allowed in a future release") + else() + get_filename_component(_abs_include "${_YPP_INCLUDE}" ABSOLUTE) + set(_YPP_INCLUDE ${_abs_include}) + endif() + else() + if(NOT EXISTS "${_YPP_INCLUDE}") + message(SEND_ERROR "The file \"${_YPP_INCLUDE}\" does not exist") + endif() + endif() + # Set up a flag to enable/disable compilation of this plugin. if(NOT YARP_PLUGIN_MASTER STREQUAL "") set(_plugin_fullname "${YARP_PLUGIN_MASTER}_${_plugin_name}") diff --git a/doc/release/master/YarpPlugin_absolute.md b/doc/release/master/YarpPlugin_absolute.md new file mode 100644 index 00000000000..0661eb88a62 --- /dev/null +++ b/doc/release/master/YarpPlugin_absolute.md @@ -0,0 +1,12 @@ +YarpPlugin_absolute {#master} +------------------ + +### CMake + +#### `yarp_prepare_plugin` + +* Including current directory (either explicitly, or using + `CMAKE_INCLUDE_CURRENT_DIR`) is no longer required by the generated files. +* `INCLUDE` must now be an existing file, either using a path relative to + current directory, or an absolute path. Using a path relative to one of the + include directories is deprecated. diff --git a/example/externaldevices/baz/bazBot/CMakeLists.txt b/example/externaldevices/baz/bazBot/CMakeLists.txt index 60dede65575..4182810c53d 100644 --- a/example/externaldevices/baz/bazBot/CMakeLists.txt +++ b/example/externaldevices/baz/bazBot/CMakeLists.txt @@ -18,8 +18,6 @@ yarp_prepare_plugin(bazbot if(NOT SKIP_bazbot) yarp_add_plugin(bazbot) - set(CMAKE_INCLUDE_CURRENT_DIR TRUE) - target_sources(bazbot PRIVATE bazbot.cpp bazbot.h) target_link_libraries(bazbot PRIVATE YARP::YARP_os diff --git a/example/externaldevices/baz/bazDevice/CMakeLists.txt b/example/externaldevices/baz/bazDevice/CMakeLists.txt index e37d717e6ff..103359416c1 100644 --- a/example/externaldevices/baz/bazDevice/CMakeLists.txt +++ b/example/externaldevices/baz/bazDevice/CMakeLists.txt @@ -18,8 +18,6 @@ yarp_prepare_plugin(bazdevice if(NOT SKIP_bazdevice) yarp_add_plugin(bazdevice) - set(CMAKE_INCLUDE_CURRENT_DIR TRUE) - target_sources(bazdevice PRIVATE bazdevice.cpp bazdevice.h) target_link_libraries(bazdevice PRIVATE YARP::YARP_os diff --git a/example/externaldevices/foo/fooBot/CMakeLists.txt b/example/externaldevices/foo/fooBot/CMakeLists.txt index 3d0d42eb269..06435f8103a 100644 --- a/example/externaldevices/foo/fooBot/CMakeLists.txt +++ b/example/externaldevices/foo/fooBot/CMakeLists.txt @@ -18,8 +18,6 @@ yarp_prepare_plugin(foobot if(NOT SKIP_foobot) yarp_add_plugin(foobot) - set(CMAKE_INCLUDE_CURRENT_DIR TRUE) - target_sources(foobot PRIVATE foobot.cpp foobot.h) target_link_libraries(foobot PRIVATE YARP::YARP_os diff --git a/example/externaldevices/foo/fooDevice/CMakeLists.txt b/example/externaldevices/foo/fooDevice/CMakeLists.txt index 7532458679e..f7e877eb087 100644 --- a/example/externaldevices/foo/fooDevice/CMakeLists.txt +++ b/example/externaldevices/foo/fooDevice/CMakeLists.txt @@ -18,8 +18,6 @@ yarp_prepare_plugin(foodevice if(NOT SKIP_foodevice) yarp_add_plugin(foodevice) - set(CMAKE_INCLUDE_CURRENT_DIR TRUE) - target_sources(foodevice PRIVATE foodevice.cpp foodevice.h) target_link_libraries(foodevice PRIVATE YARP::YARP_os diff --git a/example/portmonitor/ascii_image/CMakeLists.txt b/example/portmonitor/ascii_image/CMakeLists.txt index 55ae8bee8d4..2c793fa6c54 100644 --- a/example/portmonitor/ascii_image/CMakeLists.txt +++ b/example/portmonitor/ascii_image/CMakeLists.txt @@ -8,8 +8,6 @@ cmake_minimum_required(VERSION 3.12) find_package(YARP COMPONENTS os sig dev REQUIRED) -set(CMAKE_INCLUDE_CURRENT_DIR TRUE) - set(YARP_FORCE_DYNAMIC_PLUGINS TRUE CACHE INTERNAL "yarp_pm_asciiimage is always built with dynamic plugins") # Warning: the option of yarp_configure_plugins_installation should be different from the plugin name yarp_configure_plugins_installation(asciiimage_portmonitor) diff --git a/example/portmonitor/simple_dll/CMakeLists.txt b/example/portmonitor/simple_dll/CMakeLists.txt index 6055489ab37..929f9cfad23 100644 --- a/example/portmonitor/simple_dll/CMakeLists.txt +++ b/example/portmonitor/simple_dll/CMakeLists.txt @@ -8,8 +8,6 @@ cmake_minimum_required(VERSION 3.12) find_package(YARP COMPONENTS os sig dev REQUIRED) -set(CMAKE_INCLUDE_CURRENT_DIR TRUE) - set(YARP_FORCE_DYNAMIC_PLUGINS TRUE CACHE INTERNAL "yarp_pm_simple is always built with dynamic plugins") # Warning: the option of yarp_configure_plugins_installation should be different from the plugin name yarp_configure_plugins_installation(simplemonitor_portmonitor) diff --git a/src/carriers/bayer_carrier/CMakeLists.txt b/src/carriers/bayer_carrier/CMakeLists.txt index 6b4b093070a..ecc586ea608 100644 --- a/src/carriers/bayer_carrier/CMakeLists.txt +++ b/src/carriers/bayer_carrier/CMakeLists.txt @@ -15,8 +15,6 @@ yarp_prepare_plugin(bayer if(NOT SKIP_bayer) yarp_add_plugin(yarp_bayer) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - if(NOT YARP_HAS_Libdc1394) set(DC1394_SRC ${libdc1394_bayer_ROOT}/libdc1394_bayer.c ${libdc1394_bayer_ROOT}/conversions.h) diff --git a/src/carriers/depth_image_portmonitor/CMakeLists.txt b/src/carriers/depth_image_portmonitor/CMakeLists.txt index fee4cee79f0..41cacf00138 100644 --- a/src/carriers/depth_image_portmonitor/CMakeLists.txt +++ b/src/carriers/depth_image_portmonitor/CMakeLists.txt @@ -12,8 +12,6 @@ yarp_prepare_plugin(depthimage TYPE DepthImageConverter if(NOT SKIP_depthimage) yarp_add_plugin(yarp_pm_depthimage) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_pm_depthimage PRIVATE DepthImage.cpp DepthImage.h) target_link_libraries(yarp_pm_depthimage PRIVATE YARP::YARP_os diff --git a/src/carriers/h264_carrier/CMakeLists.txt b/src/carriers/h264_carrier/CMakeLists.txt index a000df70515..37b63af0188 100644 --- a/src/carriers/h264_carrier/CMakeLists.txt +++ b/src/carriers/h264_carrier/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(h264 if(NOT SKIP_h264) yarp_add_plugin(yarp_h264) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_h264 PRIVATE H264Carrier.h H264Carrier.cpp H264Stream.h diff --git a/src/carriers/human_carrier/CMakeLists.txt b/src/carriers/human_carrier/CMakeLists.txt index 77c807672a4..b97a91291e6 100644 --- a/src/carriers/human_carrier/CMakeLists.txt +++ b/src/carriers/human_carrier/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(human if(NOT SKIP_human) yarp_add_plugin(yarp_human) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_human PRIVATE HumanCarrier.h HumanStream.h HumanCarrier.cpp diff --git a/src/carriers/mjpeg_carrier/CMakeLists.txt b/src/carriers/mjpeg_carrier/CMakeLists.txt index 3e7e695f520..648e11fcf53 100644 --- a/src/carriers/mjpeg_carrier/CMakeLists.txt +++ b/src/carriers/mjpeg_carrier/CMakeLists.txt @@ -21,8 +21,6 @@ yarp_renamed_option(MJPEG_AUTOCOMPRESS YARP_MJPEG_AUTOCOMPRESS) # Since YARP 3.3 if(NOT SKIP_mjpeg) yarp_add_plugin(yarp_mjpeg) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_mjpeg PRIVATE MjpegCarrier.h MjpegCarrier.cpp MjpegStream.h diff --git a/src/carriers/mpi_carrier/CMakeLists.txt b/src/carriers/mpi_carrier/CMakeLists.txt index 0116a60dfb9..45112a6978e 100644 --- a/src/carriers/mpi_carrier/CMakeLists.txt +++ b/src/carriers/mpi_carrier/CMakeLists.txt @@ -21,8 +21,6 @@ yarp_renamed_option(MPI_DEBUG_MSG YARP_MPI_DEBUG_MSG) # Since YARP 3.3 if(NOT SKIP_mpi) yarp_add_plugin(yarp_mpi) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_mpi PRIVATE MpiCarrier.cpp MpiComm.cpp MpiStream.cpp @@ -67,8 +65,6 @@ yarp_prepare_plugin(mpibcast if(NOT SKIP_mpibcast) yarp_add_plugin(yarp_mpibcast) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_mpibcast PRIVATE MpiCarrier.cpp MpiBcastCarrier.cpp MpiComm.cpp diff --git a/src/carriers/portmonitor_carrier/CMakeLists.txt b/src/carriers/portmonitor_carrier/CMakeLists.txt index 3b219316ffa..c77d2530ced 100644 --- a/src/carriers/portmonitor_carrier/CMakeLists.txt +++ b/src/carriers/portmonitor_carrier/CMakeLists.txt @@ -15,9 +15,6 @@ yarp_prepare_plugin(portmonitor if (NOT SKIP_portmonitor) yarp_add_plugin(yarp_portmonitor) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - - target_sources(yarp_portmonitor PRIVATE PortMonitor.h MonitorBinding.h MonitorEvent.h @@ -30,7 +27,8 @@ if (NOT SKIP_portmonitor) lua/MonitorLua.h) endif() - target_include_directories(yarp_portmonitor PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/dll) + target_include_directories(yarp_portmonitor PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/dll) target_link_libraries(yarp_portmonitor PRIVATE YARP::YARP_os) list(APPEND YARP_${YARP_PLUGIN_MASTER}_PRIVATE_DEPS YARP_os) diff --git a/src/carriers/portmonitor_carrier/dll/MonitorSharedLib.h b/src/carriers/portmonitor_carrier/dll/MonitorSharedLib.h index 22b52c8f478..097d4a0ede1 100644 --- a/src/carriers/portmonitor_carrier/dll/MonitorSharedLib.h +++ b/src/carriers/portmonitor_carrier/dll/MonitorSharedLib.h @@ -9,14 +9,14 @@ #ifndef MONITOR_SHAREDLIB_INC #define MONITOR_SHAREDLIB_INC -#include -#include +#include "MonitorBinding.h" + +#include #include #include #include -#include -#include "MonitorBinding.h" +#include class MonitorSharedLib : public MonitorBinding { diff --git a/src/carriers/priority_carrier/CMakeLists.txt b/src/carriers/priority_carrier/CMakeLists.txt index ec3ff913c83..48c3d44781a 100644 --- a/src/carriers/priority_carrier/CMakeLists.txt +++ b/src/carriers/priority_carrier/CMakeLists.txt @@ -16,8 +16,6 @@ yarp_prepare_plugin(priority if(NOT SKIP_priority) yarp_add_plugin(yarp_priority) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_priority PRIVATE PriorityCarrier.h PriorityCarrier.cpp) diff --git a/src/carriers/shmem_carrier/CMakeLists.txt b/src/carriers/shmem_carrier/CMakeLists.txt index 55e6e351bec..4de26af329b 100644 --- a/src/carriers/shmem_carrier/CMakeLists.txt +++ b/src/carriers/shmem_carrier/CMakeLists.txt @@ -15,8 +15,6 @@ yarp_prepare_plugin(shmem if(NOT SKIP_shmem) yarp_add_plugin(yarp_shmem) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_shmem PRIVATE ShmemCarrier.cpp ShmemCarrier.h ShmemHybridStream.cpp diff --git a/src/carriers/tcpros_carrier/CMakeLists.txt b/src/carriers/tcpros_carrier/CMakeLists.txt index e57aa185b13..44cc7f2d2be 100644 --- a/src/carriers/tcpros_carrier/CMakeLists.txt +++ b/src/carriers/tcpros_carrier/CMakeLists.txt @@ -20,8 +20,6 @@ yarp_prepare_plugin(rossrv if(NOT SKIP_tcpros OR NOT SKIP_rossrv) yarp_add_plugin(yarp_tcpros) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_tcpros PRIVATE TcpRosCarrier.h TcpRosCarrier.cpp TcpRosStream.h diff --git a/src/carriers/xmlrpc_carrier/CMakeLists.txt b/src/carriers/xmlrpc_carrier/CMakeLists.txt index 9675533d0f1..9b494ec4c7e 100644 --- a/src/carriers/xmlrpc_carrier/CMakeLists.txt +++ b/src/carriers/xmlrpc_carrier/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(xmlrpc if(NOT SKIP_xmlrpc) yarp_add_plugin(yarp_xmlrpc) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_xmlrpc PRIVATE XmlRpcCarrier.h XmlRpcCarrier.cpp XmlRpcStream.h diff --git a/src/carriers/zfp_portmonitor/CMakeLists.txt b/src/carriers/zfp_portmonitor/CMakeLists.txt index 2ffc473ba58..9fcf855e204 100644 --- a/src/carriers/zfp_portmonitor/CMakeLists.txt +++ b/src/carriers/zfp_portmonitor/CMakeLists.txt @@ -12,8 +12,6 @@ yarp_prepare_plugin(zfp TYPE ZfpMonitorObject if(NOT SKIP_zfp) yarp_add_plugin(yarp_pm_zfp) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_pm_zfp PRIVATE zfpPortmonitor.cpp zfpPortmonitor.h) diff --git a/src/carriers/zfp_portmonitor/zfpPortmonitor.cpp b/src/carriers/zfp_portmonitor/zfpPortmonitor.cpp index 4aeab962436..a00d6082f06 100644 --- a/src/carriers/zfp_portmonitor/zfpPortmonitor.cpp +++ b/src/carriers/zfp_portmonitor/zfpPortmonitor.cpp @@ -6,16 +6,18 @@ * BSD-3-Clause license. See the accompanying LICENSE file for details. */ +#include "zfpPortmonitor.h" + #include #include #include #include #include #include + extern "C" { #include "zfp.h" } -#include "zfpPortmonitor.h" using namespace yarp::os; using namespace yarp::sig; diff --git a/src/devices/AnalogSensorClient/CMakeLists.txt b/src/devices/AnalogSensorClient/CMakeLists.txt index c909befcbeb..1db7a19434d 100644 --- a/src/devices/AnalogSensorClient/CMakeLists.txt +++ b/src/devices/AnalogSensorClient/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(analogsensorclient if(NOT SKIP_analogsensorclient) yarp_add_plugin(yarp_analogsensorclient) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_analogsensorclient PRIVATE AnalogSensorClient.cpp AnalogSensorClient.h) diff --git a/src/devices/AnalogWrapper/CMakeLists.txt b/src/devices/AnalogWrapper/CMakeLists.txt index c955deabf2d..b6f0884b337 100644 --- a/src/devices/AnalogWrapper/CMakeLists.txt +++ b/src/devices/AnalogWrapper/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(analogServer if(NOT SKIP_analogServer) yarp_add_plugin(yarp_analogServer) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_analogServer PRIVATE AnalogWrapper.cpp AnalogWrapper.h) diff --git a/src/devices/ControlBoardRemapper/CMakeLists.txt b/src/devices/ControlBoardRemapper/CMakeLists.txt index 84fad542fbb..794fb2fdff9 100644 --- a/src/devices/ControlBoardRemapper/CMakeLists.txt +++ b/src/devices/ControlBoardRemapper/CMakeLists.txt @@ -20,8 +20,6 @@ yarp_prepare_plugin(remotecontrolboardremapper if(NOT SKIP_controlboardremapper OR NOT SKIP_remotecontrolboardremapper) yarp_add_plugin(yarp_controlboardremapper) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_controlboardremapper PRIVATE ControlBoardRemapper.cpp ControlBoardRemapper.h ControlBoardRemapperHelpers.cpp diff --git a/src/devices/ControlBoardWrapper/CMakeLists.txt b/src/devices/ControlBoardWrapper/CMakeLists.txt index 2bb622083cf..6b74732ec9c 100644 --- a/src/devices/ControlBoardWrapper/CMakeLists.txt +++ b/src/devices/ControlBoardWrapper/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(controlboardwrapper2 if(NOT SKIP_controlboardwrapper2) yarp_add_plugin(yarp_controlboardwrapper2) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_controlboardwrapper2 PRIVATE ControlBoardWrapper.cpp ControlBoardWrapper.h RPCMessagesParser.cpp diff --git a/src/devices/DeviceGroup/CMakeLists.txt b/src/devices/DeviceGroup/CMakeLists.txt index 68bed615b0a..91bf6967422 100644 --- a/src/devices/DeviceGroup/CMakeLists.txt +++ b/src/devices/DeviceGroup/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(group if(NOT SKIP_group) yarp_add_plugin(yarp_group) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_group PRIVATE DeviceGroup.cpp DeviceGroup.h) diff --git a/src/devices/DevicePipe/CMakeLists.txt b/src/devices/DevicePipe/CMakeLists.txt index 53d3da35186..8b19793359b 100644 --- a/src/devices/DevicePipe/CMakeLists.txt +++ b/src/devices/DevicePipe/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(pipe if(NOT SKIP_pipe) yarp_add_plugin(yarp_pipe) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_pipe PRIVATE DevicePipe.cpp DevicePipe.h) diff --git a/src/devices/DynamixelAX12Ftdi/CMakeLists.txt b/src/devices/DynamixelAX12Ftdi/CMakeLists.txt index 8dbf7bd87fb..da2594d921d 100644 --- a/src/devices/DynamixelAX12Ftdi/CMakeLists.txt +++ b/src/devices/DynamixelAX12Ftdi/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(dynamixelAX12Ftdi if(NOT SKIP_dynamixelAX12Ftdi) yarp_add_plugin(yarp_dynamixelAX12Ftdi) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_dynamixelAX12Ftdi PRIVATE DynamixelAX12FtdiDriver.cpp DynamixelAX12FtdiDriver.h) diff --git a/src/devices/JoypadControlClient/CMakeLists.txt b/src/devices/JoypadControlClient/CMakeLists.txt index a41ce50197a..7a429b46ed9 100644 --- a/src/devices/JoypadControlClient/CMakeLists.txt +++ b/src/devices/JoypadControlClient/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(JoypadControlClient if(NOT SKIP_JoypadControlClient) yarp_add_plugin(yarp_JoypadControlClient) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_JoypadControlClient PRIVATE JoypadControlClient.cpp JoypadControlClient.h) diff --git a/src/devices/JoypadControlServer/CMakeLists.txt b/src/devices/JoypadControlServer/CMakeLists.txt index 2be03c83d73..00e8b2462a5 100644 --- a/src/devices/JoypadControlServer/CMakeLists.txt +++ b/src/devices/JoypadControlServer/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(JoypadControlServer if(NOT SKIP_JoypadControlServer) yarp_add_plugin(yarp_JoypadControlServer) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_JoypadControlServer PRIVATE JoypadControlServer.cpp JoypadControlServer.h) diff --git a/src/devices/RGBDSensorClient/CMakeLists.txt b/src/devices/RGBDSensorClient/CMakeLists.txt index d6e9b469e40..0945c935dad 100644 --- a/src/devices/RGBDSensorClient/CMakeLists.txt +++ b/src/devices/RGBDSensorClient/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(RGBDSensorClient if(NOT SKIP_RGBDSensorClient) yarp_add_plugin(yarp_RGBDSensorClient) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_RGBDSensorClient PRIVATE RGBDSensorClient.cpp RGBDSensorClient.h RGBDSensorClient_StreamingMsgParser.cpp diff --git a/src/devices/RGBDSensorWrapper/CMakeLists.txt b/src/devices/RGBDSensorWrapper/CMakeLists.txt index 797fbb31862..4b65554eb32 100644 --- a/src/devices/RGBDSensorWrapper/CMakeLists.txt +++ b/src/devices/RGBDSensorWrapper/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(RGBDSensorWrapper if(NOT SKIP_RGBDSensorWrapper) yarp_add_plugin(yarp_RGBDSensorWrapper) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_RGBDSensorWrapper PRIVATE RGBDSensorWrapper.cpp RGBDSensorWrapper.h rosPixelCode.h) diff --git a/src/devices/Rangefinder2DClient/CMakeLists.txt b/src/devices/Rangefinder2DClient/CMakeLists.txt index 6ca75746ba2..f28fc66e5b5 100644 --- a/src/devices/Rangefinder2DClient/CMakeLists.txt +++ b/src/devices/Rangefinder2DClient/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(Rangefinder2DClient if(NOT SKIP_Rangefinder2DClient) yarp_add_plugin(yarp_Rangefinder2DClient) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_Rangefinder2DClient PRIVATE Rangefinder2DClient.cpp Rangefinder2DClient.h) diff --git a/src/devices/Rangefinder2DWrapper/CMakeLists.txt b/src/devices/Rangefinder2DWrapper/CMakeLists.txt index 62cb444c324..f6edcb18f00 100644 --- a/src/devices/Rangefinder2DWrapper/CMakeLists.txt +++ b/src/devices/Rangefinder2DWrapper/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(Rangefinder2DWrapper if(NOT SKIP_Rangefinder2DWrapper) yarp_add_plugin(yarp_Rangefinder2DWrapper) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_Rangefinder2DWrapper PRIVATE Rangefinder2DWrapper.cpp Rangefinder2DWrapper.h) diff --git a/src/devices/RemoteControlBoard/CMakeLists.txt b/src/devices/RemoteControlBoard/CMakeLists.txt index d5b84eab8f0..0be22bd2fb8 100644 --- a/src/devices/RemoteControlBoard/CMakeLists.txt +++ b/src/devices/RemoteControlBoard/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(remote_controlboard if(NOT SKIP_remote_controlboard) yarp_add_plugin(yarp_remote_controlboard) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_remote_controlboard PRIVATE RemoteControlBoard.cpp RemoteControlBoard.h stateExtendedReader.cpp diff --git a/src/devices/RemoteFrameGrabber/CMakeLists.txt b/src/devices/RemoteFrameGrabber/CMakeLists.txt index 01da35fc9ca..7be06cca070 100644 --- a/src/devices/RemoteFrameGrabber/CMakeLists.txt +++ b/src/devices/RemoteFrameGrabber/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(remote_grabber if(NOT SKIP_remote_grabber) yarp_add_plugin(yarp_remote_grabber) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_remote_grabber PRIVATE RemoteFrameGrabber.cpp RemoteFrameGrabber.h) diff --git a/src/devices/RobotDescriptionClient/CMakeLists.txt b/src/devices/RobotDescriptionClient/CMakeLists.txt index a96ba332d21..cc1a5fe230d 100644 --- a/src/devices/RobotDescriptionClient/CMakeLists.txt +++ b/src/devices/RobotDescriptionClient/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(robotDescriptionClient if(NOT SKIP_robotDescriptionClient) yarp_add_plugin(yarp_robotDescriptionClient) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_robotDescriptionClient PRIVATE RobotDescriptionClient.cpp RobotDescriptionClient.h) diff --git a/src/devices/RobotDescriptionServer/CMakeLists.txt b/src/devices/RobotDescriptionServer/CMakeLists.txt index e6dfe8abe24..fdcd00c52a0 100644 --- a/src/devices/RobotDescriptionServer/CMakeLists.txt +++ b/src/devices/RobotDescriptionServer/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(robotDescriptionServer if(NOT SKIP_robotDescriptionServer) yarp_add_plugin(yarp_robotDescriptionServer) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_robotDescriptionServer PRIVATE RobotDescriptionServer.cpp RobotDescriptionServer.h) diff --git a/src/devices/SDLJoypad/CMakeLists.txt b/src/devices/SDLJoypad/CMakeLists.txt index 8d0a53ea0a4..02a6439ec36 100644 --- a/src/devices/SDLJoypad/CMakeLists.txt +++ b/src/devices/SDLJoypad/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(SDLJoypad if(ENABLE_SDLJoypad) yarp_add_plugin(yarp_SDLJoypad) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_SDLJoypad PRIVATE SDLJoypad.cpp SDLJoypad.h) diff --git a/src/devices/SerialServoBoard/CMakeLists.txt b/src/devices/SerialServoBoard/CMakeLists.txt index 92aa4a0716d..91a88b4d2b5 100644 --- a/src/devices/SerialServoBoard/CMakeLists.txt +++ b/src/devices/SerialServoBoard/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(SerialServoBoard if(NOT SKIP_SerialServoBoard) yarp_add_plugin(yarp_SerialServoBoard) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_SerialServoBoard PRIVATE SerialServoBoard.cpp SerialServoBoard.h) diff --git a/src/devices/ServerFrameGrabber/CMakeLists.txt b/src/devices/ServerFrameGrabber/CMakeLists.txt index 0558beac61b..c46104b8e2b 100644 --- a/src/devices/ServerFrameGrabber/CMakeLists.txt +++ b/src/devices/ServerFrameGrabber/CMakeLists.txt @@ -15,8 +15,6 @@ yarp_prepare_plugin(grabber if(NOT SKIP_grabber) yarp_add_plugin(yarp_grabber) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_grabber PRIVATE ServerFrameGrabber.cpp ServerFrameGrabber.h) diff --git a/src/devices/ServerGrabber/CMakeLists.txt b/src/devices/ServerGrabber/CMakeLists.txt index e57a30c7f3b..6de7ac9bc69 100644 --- a/src/devices/ServerGrabber/CMakeLists.txt +++ b/src/devices/ServerGrabber/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(grabberDual if(NOT SKIP_grabberDual) yarp_add_plugin(yarp_grabberDual) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_grabberDual PRIVATE ServerGrabber.cpp ServerGrabber.h) diff --git a/src/devices/ServerInertial/CMakeLists.txt b/src/devices/ServerInertial/CMakeLists.txt index 91f32b296ce..ae4af9b2e6d 100644 --- a/src/devices/ServerInertial/CMakeLists.txt +++ b/src/devices/ServerInertial/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(inertial if(NOT SKIP_inertial) yarp_add_plugin(yarp_inertial) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_inertial PRIVATE ServerInertial.cpp ServerInertial.h) diff --git a/src/devices/ServerSerial/CMakeLists.txt b/src/devices/ServerSerial/CMakeLists.txt index 1c7fde773ba..f21aee8b6ed 100644 --- a/src/devices/ServerSerial/CMakeLists.txt +++ b/src/devices/ServerSerial/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(serial if(NOT SKIP_serial) yarp_add_plugin(yarp_serial) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_serial PRIVATE ServerSerial.cpp ServerSerial.h) diff --git a/src/devices/ServerSoundGrabber/CMakeLists.txt b/src/devices/ServerSoundGrabber/CMakeLists.txt index dcb61fd3aec..9c0b44979ff 100644 --- a/src/devices/ServerSoundGrabber/CMakeLists.txt +++ b/src/devices/ServerSoundGrabber/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(ServerSoundGrabber if(NOT SKIP_ServerSoundGrabber) yarp_add_plugin(yarp_ServerSoundGrabber) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_ServerSoundGrabber PRIVATE ServerSoundGrabber.h) target_link_libraries(yarp_ServerSoundGrabber PRIVATE YARP::YARP_os diff --git a/src/devices/TestMotor/CMakeLists.txt b/src/devices/TestMotor/CMakeLists.txt index 8025dfabe70..c0b536e4833 100644 --- a/src/devices/TestMotor/CMakeLists.txt +++ b/src/devices/TestMotor/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(test_motor if(NOT SKIP_test_motor) yarp_add_plugin(yarp_test_motor) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_test_motor PRIVATE TestMotor.cpp TestMotor.h) diff --git a/src/devices/VirtualAnalogWrapper/CMakeLists.txt b/src/devices/VirtualAnalogWrapper/CMakeLists.txt index ad9b12b7c06..85940c6db52 100644 --- a/src/devices/VirtualAnalogWrapper/CMakeLists.txt +++ b/src/devices/VirtualAnalogWrapper/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(virtualAnalogServer if(NOT SKIP_virtualAnalogServer) yarp_add_plugin(yarp_virtualAnalogServer) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_virtualAnalogServer PRIVATE VirtualAnalogWrapper.cpp VirtualAnalogWrapper.h) diff --git a/src/devices/audioPlayerWrapper/CMakeLists.txt b/src/devices/audioPlayerWrapper/CMakeLists.txt index e65577bd586..036028055ef 100644 --- a/src/devices/audioPlayerWrapper/CMakeLists.txt +++ b/src/devices/audioPlayerWrapper/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(AudioPlayerWrapper if(NOT SKIP_AudioPlayerWrapper) yarp_add_plugin(yarp_AudioPlayerWrapper) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_AudioPlayerWrapper PRIVATE AudioPlayerWrapper.cpp AudioPlayerWrapper.h) target_link_libraries(yarp_AudioPlayerWrapper PRIVATE YARP::YARP_os diff --git a/src/devices/audioRecorderWrapper/AudioRecorderWrapper.cpp b/src/devices/audioRecorderWrapper/AudioRecorderWrapper.cpp index 80b23e42f38..15f27fb4c14 100644 --- a/src/devices/audioRecorderWrapper/AudioRecorderWrapper.cpp +++ b/src/devices/audioRecorderWrapper/AudioRecorderWrapper.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "AudioRecorderWrapper.h" #include using namespace yarp::dev; diff --git a/src/devices/audioRecorderWrapper/CMakeLists.txt b/src/devices/audioRecorderWrapper/CMakeLists.txt index f2791e0fa66..fd30ac8a118 100644 --- a/src/devices/audioRecorderWrapper/CMakeLists.txt +++ b/src/devices/audioRecorderWrapper/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(AudioRecorderWrapper if(NOT SKIP_AudioRecorderWrapper) yarp_add_plugin(yarp_AudioRecorderWrapper) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_AudioRecorderWrapper PRIVATE AudioRecorderWrapper.cpp AudioRecorderWrapper.h) target_link_libraries(yarp_AudioRecorderWrapper PRIVATE YARP::YARP_os diff --git a/src/devices/batteryClient/CMakeLists.txt b/src/devices/batteryClient/CMakeLists.txt index b1f7a46a83e..1953a1c0e0e 100644 --- a/src/devices/batteryClient/CMakeLists.txt +++ b/src/devices/batteryClient/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(batteryClient if(NOT SKIP_batteryClient) yarp_add_plugin(yarp_batteryClient) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_batteryClient PRIVATE BatteryClient.cpp BatteryClient.h) diff --git a/src/devices/batteryWrapper/CMakeLists.txt b/src/devices/batteryWrapper/CMakeLists.txt index 2208ce432b6..35ccf4a75fe 100644 --- a/src/devices/batteryWrapper/CMakeLists.txt +++ b/src/devices/batteryWrapper/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(batteryWrapper if(NOT SKIP_batteryWrapper) yarp_add_plugin(yarp_batteryWrapper) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_batteryWrapper PRIVATE BatteryWrapper.cpp BatteryWrapper.h) diff --git a/src/devices/depthCamera/CMakeLists.txt b/src/devices/depthCamera/CMakeLists.txt index e02711a1e28..5e476cdce81 100644 --- a/src/devices/depthCamera/CMakeLists.txt +++ b/src/devices/depthCamera/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(depthCamera if(ENABLE_depthCamera) yarp_add_plugin(yarp_depthCamera) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_depthCamera PRIVATE depthCameraDriver.cpp depthCameraDriver.h) diff --git a/src/devices/fakeAnalogSensor/CMakeLists.txt b/src/devices/fakeAnalogSensor/CMakeLists.txt index 3e05657f4de..9373c67e038 100644 --- a/src/devices/fakeAnalogSensor/CMakeLists.txt +++ b/src/devices/fakeAnalogSensor/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(fakeAnalogSensor if(ENABLE_fakeAnalogSensor) yarp_add_plugin(yarp_fakeAnalogSensor) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_fakeAnalogSensor PRIVATE fakeAnalogSensor.cpp fakeAnalogSensor.h) diff --git a/src/devices/fakeAnalogSensor/fakeAnalogSensor.cpp b/src/devices/fakeAnalogSensor/fakeAnalogSensor.cpp index b755ee6ffc4..95126e4c0a0 100644 --- a/src/devices/fakeAnalogSensor/fakeAnalogSensor.cpp +++ b/src/devices/fakeAnalogSensor/fakeAnalogSensor.cpp @@ -6,12 +6,11 @@ * BSD-3-Clause license. See the accompanying LICENSE file for details. */ +#include "fakeAnalogSensor.h" #include #include -#include - using namespace std; using namespace yarp::dev; diff --git a/src/devices/fakeBattery/CMakeLists.txt b/src/devices/fakeBattery/CMakeLists.txt index f28d5b3c464..f5b4b7c1ece 100644 --- a/src/devices/fakeBattery/CMakeLists.txt +++ b/src/devices/fakeBattery/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(fakeBattery if(NOT SKIP_fakeBattery) yarp_add_plugin(yarp_fakeBattery) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_fakeBattery PRIVATE fakeBattery.cpp fakeBattery.h) diff --git a/src/devices/fakeDepthCamera/CMakeLists.txt b/src/devices/fakeDepthCamera/CMakeLists.txt index cab94a2c721..c2e4d3d8436 100644 --- a/src/devices/fakeDepthCamera/CMakeLists.txt +++ b/src/devices/fakeDepthCamera/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(fakeDepthCamera if(ENABLE_fakeDepthCamera) yarp_add_plugin(yarp_fakeDepthCamera) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_fakeDepthCamera PRIVATE fakeDepthCameraDriver.cpp fakeDepthCameraDriver.h) diff --git a/src/devices/fakeIMU/CMakeLists.txt b/src/devices/fakeIMU/CMakeLists.txt index 2a575dbf818..80fa506ce21 100644 --- a/src/devices/fakeIMU/CMakeLists.txt +++ b/src/devices/fakeIMU/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(fakeIMU if(NOT SKIP_fakeIMU) yarp_add_plugin(yarp_fakeIMU) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_fakeIMU PRIVATE fakeIMU.cpp fakeIMU.h) diff --git a/src/devices/fakeIMU/fakeIMU.cpp b/src/devices/fakeIMU/fakeIMU.cpp index 40a1c869508..05128ee3ac3 100644 --- a/src/devices/fakeIMU/fakeIMU.cpp +++ b/src/devices/fakeIMU/fakeIMU.cpp @@ -6,14 +6,15 @@ * BSD-3-Clause license. See the accompanying LICENSE file for details. */ -#include +#include "fakeIMU.h" + #include #include #include #include #include -#include +#include using namespace yarp::os; using namespace yarp::dev; diff --git a/src/devices/fakeLaser/CMakeLists.txt b/src/devices/fakeLaser/CMakeLists.txt index d68d735321e..91a535378c7 100644 --- a/src/devices/fakeLaser/CMakeLists.txt +++ b/src/devices/fakeLaser/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(fakeLaser if(NOT SKIP_fakeLaser) yarp_add_plugin(yarp_fakeLaser) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_fakeLaser PRIVATE fakeLaser.h fakeLaser.cpp) diff --git a/src/devices/fakeLocalizerDevice/CMakeLists.txt b/src/devices/fakeLocalizerDevice/CMakeLists.txt index 4bda2656bca..e6134ac4a1b 100644 --- a/src/devices/fakeLocalizerDevice/CMakeLists.txt +++ b/src/devices/fakeLocalizerDevice/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(fakeLocalizer if(NOT SKIP_fakeLocalizer) yarp_add_plugin(yarp_fakeLocalizer) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_fakeLocalizer PRIVATE fakeLocalizerDev.h fakeLocalizerDev.cpp) diff --git a/src/devices/fakeMicrophone/CMakeLists.txt b/src/devices/fakeMicrophone/CMakeLists.txt index 91b3afe4d59..ea19b3fa4bf 100644 --- a/src/devices/fakeMicrophone/CMakeLists.txt +++ b/src/devices/fakeMicrophone/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(fakeMicrophone if(NOT SKIP_fakeMicrophone) yarp_add_plugin(yarp_fakeMicrophone) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_fakeMicrophone PRIVATE fakeMicrophone.cpp fakeMicrophone.h) diff --git a/src/devices/fakeMotionControl/CMakeLists.txt b/src/devices/fakeMotionControl/CMakeLists.txt index 7a7be68a2e8..8a1f80d1115 100644 --- a/src/devices/fakeMotionControl/CMakeLists.txt +++ b/src/devices/fakeMotionControl/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(fakeMotionControl if(NOT SKIP_fakeMotionControl) yarp_add_plugin(yarp_fakeMotionControl) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_fakeMotionControl PRIVATE fakeMotionControl.cpp fakeMotionControl.h) diff --git a/src/devices/fakeNavigationDevice/CMakeLists.txt b/src/devices/fakeNavigationDevice/CMakeLists.txt index e1db4c71f0f..7ad797f830c 100644 --- a/src/devices/fakeNavigationDevice/CMakeLists.txt +++ b/src/devices/fakeNavigationDevice/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(fakeNavigation if(NOT SKIP_fakeNavigation) yarp_add_plugin(yarp_fakeNavigation) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_fakeNavigation PRIVATE fakeNavigationDev.h fakeNavigationDev.cpp) diff --git a/src/devices/fakeSpeaker/CMakeLists.txt b/src/devices/fakeSpeaker/CMakeLists.txt index 35e154e7938..fab132c1683 100644 --- a/src/devices/fakeSpeaker/CMakeLists.txt +++ b/src/devices/fakeSpeaker/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(fakeSpeaker if(NOT SKIP_fakeSpeaker) yarp_add_plugin(yarp_fakeSpeaker) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_fakeSpeaker PRIVATE fakeSpeaker.cpp fakeSpeaker.h) diff --git a/src/devices/fakeSpeaker/fakeSpeaker.cpp b/src/devices/fakeSpeaker/fakeSpeaker.cpp index 656282c122c..1e927f903b6 100644 --- a/src/devices/fakeSpeaker/fakeSpeaker.cpp +++ b/src/devices/fakeSpeaker/fakeSpeaker.cpp @@ -6,6 +6,8 @@ * BSD-3-Clause license. See the accompanying LICENSE file for details. */ +#include "fakeSpeaker.h" + #include #include #include @@ -13,8 +15,6 @@ #include #include -#include - using namespace yarp::os; using namespace yarp::dev; using namespace yarp::sig; diff --git a/src/devices/fakebot/CMakeLists.txt b/src/devices/fakebot/CMakeLists.txt index 80bcf19b5e2..d92a7aa587f 100644 --- a/src/devices/fakebot/CMakeLists.txt +++ b/src/devices/fakebot/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(fakebot if(NOT SKIP_fakebot) yarp_add_plugin(yarp_fakebot) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_fakebot PRIVATE FakeBot.cpp FakeBot.h) diff --git a/src/devices/ffmpeg/CMakeLists.txt b/src/devices/ffmpeg/CMakeLists.txt index bfb4430dca0..ba89a2cda33 100644 --- a/src/devices/ffmpeg/CMakeLists.txt +++ b/src/devices/ffmpeg/CMakeLists.txt @@ -20,7 +20,6 @@ yarp_prepare_plugin(ffmpeg_writer if(NOT SKIP_ffmpeg_grabber OR NOT SKIP_ffmpeg_writer) yarp_add_plugin(yarp_ffmpeg) - set(CMAKE_INCLUDE_CURRENT_DIR ON) target_sources(yarp_ffmpeg PRIVATE FfmpegGrabber.cpp FfmpegWriter.cpp FfmpegGrabber.h diff --git a/src/devices/ffmpeg/FfmpegGrabber.h b/src/devices/ffmpeg/FfmpegGrabber.h index 5677608d73c..784beccd2c9 100644 --- a/src/devices/ffmpeg/FfmpegGrabber.h +++ b/src/devices/ffmpeg/FfmpegGrabber.h @@ -18,7 +18,7 @@ extern "C" { } /* - * A Yarp 2 frame grabber device driver using ffmpeg to implement + * A YARP frame grabber device driver using ffmpeg to implement * image capture from AVI files. */ diff --git a/src/devices/imuBosch_BNO055/CMakeLists.txt b/src/devices/imuBosch_BNO055/CMakeLists.txt index 083d41670a6..c6fad19efe5 100644 --- a/src/devices/imuBosch_BNO055/CMakeLists.txt +++ b/src/devices/imuBosch_BNO055/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(imuBosch_BNO055 if(ENABLE_imuBosch_BNO055) yarp_add_plugin(yarp_imuBosch_BNO055) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_imuBosch_BNO055 PRIVATE imuBosch_BNO055.cpp imuBosch_BNO055.h) diff --git a/src/devices/laserFromDepth/CMakeLists.txt b/src/devices/laserFromDepth/CMakeLists.txt index 33263f826b7..c84dc9b5b9d 100644 --- a/src/devices/laserFromDepth/CMakeLists.txt +++ b/src/devices/laserFromDepth/CMakeLists.txt @@ -12,8 +12,6 @@ yarp_prepare_plugin(laserFromDepth if(NOT SKIP_laserFromDepth) yarp_add_plugin(laserFromDepth) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(laserFromDepth PRIVATE laserFromDepth.h laserFromDepth.cpp) diff --git a/src/devices/laserFromDepth/laserFromDepth.cpp b/src/devices/laserFromDepth/laserFromDepth.cpp index cd68a984b7e..d79351f864d 100644 --- a/src/devices/laserFromDepth/laserFromDepth.cpp +++ b/src/devices/laserFromDepth/laserFromDepth.cpp @@ -18,19 +18,19 @@ #define _USE_MATH_DEFINES -#include +#include "laserFromDepth.h" #include #include #include -#include #include -#include + +#include #include #include +#include #include - -#include +#include using namespace std; diff --git a/src/devices/laserHokuyo/CMakeLists.txt b/src/devices/laserHokuyo/CMakeLists.txt index e7f1101c93d..f7928406bf0 100644 --- a/src/devices/laserHokuyo/CMakeLists.txt +++ b/src/devices/laserHokuyo/CMakeLists.txt @@ -12,8 +12,6 @@ yarp_prepare_plugin(laserHokuyo if(NOT SKIP_laserHokuyo) yarp_add_plugin(laserHokuyo) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(laserHokuyo PRIVATE laserHokuyo.h laserHokuyo.cpp) diff --git a/src/devices/laserHokuyo/laserHokuyo.cpp b/src/devices/laserHokuyo/laserHokuyo.cpp index 4dfa2b0b617..f916d0d91c7 100644 --- a/src/devices/laserHokuyo/laserHokuyo.cpp +++ b/src/devices/laserHokuyo/laserHokuyo.cpp @@ -18,16 +18,17 @@ #define _USE_MATH_DEFINES -#include +#include "laserHokuyo.h" #include #include #include -#include -#include + +#include #include +#include +#include #include -#include //#define LASER_DEBUG diff --git a/src/devices/localization2DClient/CMakeLists.txt b/src/devices/localization2DClient/CMakeLists.txt index 059b3d3ffb5..cb7768b039b 100644 --- a/src/devices/localization2DClient/CMakeLists.txt +++ b/src/devices/localization2DClient/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(localization2DClient if(NOT SKIP_localization2DClient) yarp_add_plugin(yarp_localization2DClient) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_localization2DClient PRIVATE Localization2DClient.cpp Localization2DClient.h) diff --git a/src/devices/localization2DServer/CMakeLists.txt b/src/devices/localization2DServer/CMakeLists.txt index 618d42f43a4..48a5e843229 100644 --- a/src/devices/localization2DServer/CMakeLists.txt +++ b/src/devices/localization2DServer/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(localization2DServer if(NOT SKIP_localization2DServer) yarp_add_plugin(yarp_localization2DServer) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_localization2DServer PRIVATE Localization2DServer.h Localization2DServer.cpp) diff --git a/src/devices/map2DClient/CMakeLists.txt b/src/devices/map2DClient/CMakeLists.txt index b7a9cdafbd0..77ec5270f03 100644 --- a/src/devices/map2DClient/CMakeLists.txt +++ b/src/devices/map2DClient/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(map2DClient if(NOT SKIP_map2DClient) yarp_add_plugin(yarp_map2DClient) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_map2DClient PRIVATE Map2DClient.cpp Map2DClient.h) diff --git a/src/devices/map2DServer/CMakeLists.txt b/src/devices/map2DServer/CMakeLists.txt index 003f679c153..11c064f9848 100644 --- a/src/devices/map2DServer/CMakeLists.txt +++ b/src/devices/map2DServer/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(map2DServer if(NOT SKIP_map2DServer) yarp_add_plugin(yarp_map2DServer) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_map2DServer PRIVATE Map2DServer.cpp Map2DServer.h) diff --git a/src/devices/multipleanalogsensorsclient/CMakeLists.txt b/src/devices/multipleanalogsensorsclient/CMakeLists.txt index daaaec3fc8c..6546703c71e 100644 --- a/src/devices/multipleanalogsensorsclient/CMakeLists.txt +++ b/src/devices/multipleanalogsensorsclient/CMakeLists.txt @@ -13,7 +13,6 @@ yarp_prepare_plugin(multipleanalogsensorsclient if(ENABLE_multipleanalogsensorsclient) yarp_add_plugin(yarp_multipleanalogsensorsclient) - set(CMAKE_INCLUDE_CURRENT_DIR ON) target_sources(yarp_multipleanalogsensorsclient PRIVATE MultipleAnalogSensorsClient.cpp MultipleAnalogSensorsClient.h) diff --git a/src/devices/multipleanalogsensorsremapper/CMakeLists.txt b/src/devices/multipleanalogsensorsremapper/CMakeLists.txt index 922176c6961..a2d601723cf 100644 --- a/src/devices/multipleanalogsensorsremapper/CMakeLists.txt +++ b/src/devices/multipleanalogsensorsremapper/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(multipleanalogsensorsremapper if(ENABLE_multipleanalogsensorsremapper) yarp_add_plugin(yarp_multipleanalogsensorsremapper) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_multipleanalogsensorsremapper PRIVATE MultipleAnalogSensorsRemapper.cpp MultipleAnalogSensorsRemapper.h) diff --git a/src/devices/multipleanalogsensorsserver/CMakeLists.txt b/src/devices/multipleanalogsensorsserver/CMakeLists.txt index 61dc1aa1eb0..a98e4ed8b9d 100644 --- a/src/devices/multipleanalogsensorsserver/CMakeLists.txt +++ b/src/devices/multipleanalogsensorsserver/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(multipleanalogsensorsserver if(ENABLE_multipleanalogsensorsserver) yarp_add_plugin(yarp_multipleanalogsensorsserver) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_multipleanalogsensorsserver PRIVATE MultipleAnalogSensorsServer.cpp MultipleAnalogSensorsServer.h) diff --git a/src/devices/navigation2DClient/CMakeLists.txt b/src/devices/navigation2DClient/CMakeLists.txt index 46832ded8b3..e195f7ec8b9 100644 --- a/src/devices/navigation2DClient/CMakeLists.txt +++ b/src/devices/navigation2DClient/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(navigation2DClient if(NOT SKIP_navigation2DClient) yarp_add_plugin(yarp_navigation2DClient) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_navigation2DClient PRIVATE Navigation2DClient.cpp Navigation2DClient.h) diff --git a/src/devices/navigation2DServer/CMakeLists.txt b/src/devices/navigation2DServer/CMakeLists.txt index 64d67d13001..149db11df2b 100644 --- a/src/devices/navigation2DServer/CMakeLists.txt +++ b/src/devices/navigation2DServer/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(navigation2DServer if(NOT SKIP_navigation2DServer) yarp_add_plugin(yarp_navigation2DServer) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_navigation2DServer PRIVATE navigation2DServer.h navigation2DServer.cpp) diff --git a/src/devices/opencv/CMakeLists.txt b/src/devices/opencv/CMakeLists.txt index db1c5e0ea43..7dc263ec03f 100644 --- a/src/devices/opencv/CMakeLists.txt +++ b/src/devices/opencv/CMakeLists.txt @@ -15,8 +15,6 @@ yarp_prepare_plugin(opencv_grabber if(NOT SKIP_opencv_grabber) yarp_add_plugin(yarp_opencv) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_opencv PRIVATE OpenCVGrabber.cpp OpenCVGrabber.h) diff --git a/src/devices/opencv/OpenCVGrabber.cpp b/src/devices/opencv/OpenCVGrabber.cpp index f23d85d4ec0..61d68483c3c 100644 --- a/src/devices/opencv/OpenCVGrabber.cpp +++ b/src/devices/opencv/OpenCVGrabber.cpp @@ -19,10 +19,11 @@ */ /* - * A Yarp 2 frame grabber device driver using OpenCV to implement + * A YARP frame grabber device driver using OpenCV to implement * image capture from cameras and AVI files. */ +#include "OpenCVGrabber.h" #include #include @@ -42,7 +43,6 @@ #include #include -#include using yarp::dev::DeviceDriver; diff --git a/src/devices/opencv/OpenCVGrabber.h b/src/devices/opencv/OpenCVGrabber.h index d586d0919ff..9614c4c4629 100644 --- a/src/devices/opencv/OpenCVGrabber.h +++ b/src/devices/opencv/OpenCVGrabber.h @@ -22,7 +22,7 @@ #define YARP_OPENCV_GRABBER_DEVICE_OPENCVGRABBER_H /* - * A Yarp 2 frame grabber device driver using OpenCV to implement + * A YARP frame grabber device driver using OpenCV to implement * image capture from cameras and AVI files. */ @@ -35,8 +35,6 @@ #include -#include - /** * @ingroup dev_impl_media * diff --git a/src/devices/ovrheadset/CMakeLists.txt b/src/devices/ovrheadset/CMakeLists.txt index 43894c0b00e..3c199729e23 100644 --- a/src/devices/ovrheadset/CMakeLists.txt +++ b/src/devices/ovrheadset/CMakeLists.txt @@ -13,8 +13,6 @@ yarp_prepare_plugin(ovrheadset if(NOT SKIP_ovrheadset) yarp_add_plugin(yarp_ovrheadset) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(yarp_ovrheadset_SRCS OVRHeadset.cpp TextureBuffer.cpp TextureStatic.cpp diff --git a/src/devices/portaudio/CMakeLists.txt b/src/devices/portaudio/CMakeLists.txt index 88aa060bc2d..24fa7d9fb61 100644 --- a/src/devices/portaudio/CMakeLists.txt +++ b/src/devices/portaudio/CMakeLists.txt @@ -16,8 +16,6 @@ yarp_prepare_plugin(portaudio if(NOT SKIP_portaudio) yarp_add_plugin(yarp_portaudio) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_portaudio PRIVATE PortAudioBuffer.cpp PortAudioBuffer.h PortAudioDeviceDriver.cpp diff --git a/src/devices/portaudio/PortAudioDeviceDriver.cpp b/src/devices/portaudio/PortAudioDeviceDriver.cpp index 52d059da5d8..1f6f4e05f5c 100644 --- a/src/devices/portaudio/PortAudioDeviceDriver.cpp +++ b/src/devices/portaudio/PortAudioDeviceDriver.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "PortAudioDeviceDriver.h" #include #include diff --git a/src/devices/portaudioPlayer/CMakeLists.txt b/src/devices/portaudioPlayer/CMakeLists.txt index b67e0c92277..10e1f500aab 100644 --- a/src/devices/portaudioPlayer/CMakeLists.txt +++ b/src/devices/portaudioPlayer/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(portaudioPlayer if(NOT SKIP_portaudioPlayer) yarp_add_plugin(yarp_portaudioPlayer) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_portaudioPlayer PRIVATE PortAudioPlayerDeviceDriver.cpp PortAudioPlayerDeviceDriver.h) diff --git a/src/devices/portaudioPlayer/PortAudioPlayerDeviceDriver.cpp b/src/devices/portaudioPlayer/PortAudioPlayerDeviceDriver.cpp index b8b6721451d..eae17349fc6 100644 --- a/src/devices/portaudioPlayer/PortAudioPlayerDeviceDriver.cpp +++ b/src/devices/portaudioPlayer/PortAudioPlayerDeviceDriver.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "PortAudioPlayerDeviceDriver.h" #include #include diff --git a/src/devices/portaudioRecorder/CMakeLists.txt b/src/devices/portaudioRecorder/CMakeLists.txt index 443666949c6..0f2cbbe472d 100644 --- a/src/devices/portaudioRecorder/CMakeLists.txt +++ b/src/devices/portaudioRecorder/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(portaudioRecorder if(NOT SKIP_portaudioRecorder) yarp_add_plugin(yarp_portaudioRecorder) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_portaudioRecorder PRIVATE PortAudioRecorderDeviceDriver.cpp PortAudioRecorderDeviceDriver.h) diff --git a/src/devices/portaudioRecorder/PortAudioRecorderDeviceDriver.cpp b/src/devices/portaudioRecorder/PortAudioRecorderDeviceDriver.cpp index 5fddb609d26..38b5972e729 100644 --- a/src/devices/portaudioRecorder/PortAudioRecorderDeviceDriver.cpp +++ b/src/devices/portaudioRecorder/PortAudioRecorderDeviceDriver.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "PortAudioRecorderDeviceDriver.h" #include #include diff --git a/src/devices/realsense2/CMakeLists.txt b/src/devices/realsense2/CMakeLists.txt index 96820746908..be050127e5a 100644 --- a/src/devices/realsense2/CMakeLists.txt +++ b/src/devices/realsense2/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(realsense2 if(ENABLE_realsense2) yarp_add_plugin(yarp_realsense2) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_realsense2 PRIVATE realsense2Driver.cpp realsense2Driver.h) diff --git a/src/devices/rpLidar/CMakeLists.txt b/src/devices/rpLidar/CMakeLists.txt index 365c08f7c7e..2e14aab1a11 100644 --- a/src/devices/rpLidar/CMakeLists.txt +++ b/src/devices/rpLidar/CMakeLists.txt @@ -12,8 +12,6 @@ yarp_prepare_plugin(rpLidar if(NOT SKIP_rpLidar) yarp_add_plugin(yarp_rpLidar) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_rpLidar PRIVATE rpLidar.h rpLidar.cpp) diff --git a/src/devices/rpLidar/rpLidar.cpp b/src/devices/rpLidar/rpLidar.cpp index 3489054b80b..1483b4301ac 100644 --- a/src/devices/rpLidar/rpLidar.cpp +++ b/src/devices/rpLidar/rpLidar.cpp @@ -18,19 +18,20 @@ #define _USE_MATH_DEFINES -#include +#include "rpLidar.h" #include #include #include #include -#include -#include + +#include #include +#include +#include #include #include -#include //#define LASER_DEBUG //#define FORCE_SCAN diff --git a/src/devices/rpLidar2/CMakeLists.txt b/src/devices/rpLidar2/CMakeLists.txt index f54b82ecf73..4054793a14b 100644 --- a/src/devices/rpLidar2/CMakeLists.txt +++ b/src/devices/rpLidar2/CMakeLists.txt @@ -37,8 +37,6 @@ if(NOT SKIP_rpLidar2) # Build YARP rpLidar2 device yarp_add_plugin(yarp_rpLidar2) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_rpLidar2 PRIVATE rpLidar2.h rpLidar2.cpp) target_compile_definitions(yarp_rpLidar2 PRIVATE _USE_MATH_DEFINES) diff --git a/src/devices/rpLidar2/rpLidar2.cpp b/src/devices/rpLidar2/rpLidar2.cpp index 6e0c2ae347b..502b94db292 100644 --- a/src/devices/rpLidar2/rpLidar2.cpp +++ b/src/devices/rpLidar2/rpLidar2.cpp @@ -16,15 +16,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "rpLidar2.h" #include #include #include #include -#include -#include + #include +#include +#include #include #include diff --git a/src/devices/serialport/CMakeLists.txt b/src/devices/serialport/CMakeLists.txt index 40f2aeafef7..21d8442d676 100644 --- a/src/devices/serialport/CMakeLists.txt +++ b/src/devices/serialport/CMakeLists.txt @@ -15,8 +15,6 @@ yarp_prepare_plugin(serialport if(NOT SKIP_serialport) yarp_add_plugin(yarp_serialport) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_serialport PRIVATE SerialDeviceDriver.cpp SerialDeviceDriver.h) diff --git a/src/devices/serialport/SerialDeviceDriver.cpp b/src/devices/serialport/SerialDeviceDriver.cpp index 23a6847608a..2329256843d 100644 --- a/src/devices/serialport/SerialDeviceDriver.cpp +++ b/src/devices/serialport/SerialDeviceDriver.cpp @@ -8,14 +8,13 @@ * BSD-3-Clause license. See the accompanying LICENSE file for details. */ -#include +#include "SerialDeviceDriver.h" + +#include #include #include -///#include -#include - using namespace yarp::os; using namespace yarp::dev; diff --git a/src/devices/test_grabber/CMakeLists.txt b/src/devices/test_grabber/CMakeLists.txt index 563a3b1fdbb..ce3e4dce25d 100644 --- a/src/devices/test_grabber/CMakeLists.txt +++ b/src/devices/test_grabber/CMakeLists.txt @@ -14,7 +14,6 @@ yarp_prepare_plugin(test_grabber if(ENABLE_test_grabber) yarp_add_plugin(yarp_test_grabber) - set(CMAKE_INCLUDE_CURRENT_DIR ON) target_sources(yarp_test_grabber PRIVATE TestFrameGrabber.cpp TestFrameGrabber.h) diff --git a/src/devices/test_grabber/TestFrameGrabber.cpp b/src/devices/test_grabber/TestFrameGrabber.cpp index e8a9917c461..a7fc6ca1670 100644 --- a/src/devices/test_grabber/TestFrameGrabber.cpp +++ b/src/devices/test_grabber/TestFrameGrabber.cpp @@ -7,12 +7,12 @@ * BSD-3-Clause license. See the accompanying LICENSE file for details. */ -#include -#include +#include "TestFrameGrabber.h" +#include #include + #include -#include using namespace yarp::os; using namespace yarp::dev; diff --git a/src/devices/test_nop/CMakeLists.txt b/src/devices/test_nop/CMakeLists.txt index 6ebc1986ecf..1ca8265d4e1 100644 --- a/src/devices/test_nop/CMakeLists.txt +++ b/src/devices/test_nop/CMakeLists.txt @@ -17,8 +17,6 @@ yarp_prepare_plugin(test_nop if(NOT SKIP_test_nop) yarp_add_plugin(yarp_test_nop) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_test_nop PRIVATE Nop.cpp Nop.h) diff --git a/src/devices/test_segfault/CMakeLists.txt b/src/devices/test_segfault/CMakeLists.txt index c13c1d45197..f8dc3b0f91b 100644 --- a/src/devices/test_segfault/CMakeLists.txt +++ b/src/devices/test_segfault/CMakeLists.txt @@ -17,8 +17,6 @@ yarp_prepare_plugin(test_segfault if(NOT SKIP_test_segfault) yarp_add_plugin(yarp_test_segfault) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_test_segfault PRIVATE SegFault.cpp SegFault.h) diff --git a/src/devices/transformClient/CMakeLists.txt b/src/devices/transformClient/CMakeLists.txt index 939ba5ca87a..8bbe0f3f708 100644 --- a/src/devices/transformClient/CMakeLists.txt +++ b/src/devices/transformClient/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(transformClient if(NOT SKIP_transformClient) yarp_add_plugin(yarp_transformClient) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_transformClient PRIVATE FrameTransformClient.cpp FrameTransformClient.h) diff --git a/src/devices/transformServer/CMakeLists.txt b/src/devices/transformServer/CMakeLists.txt index 1b60418e96a..6934eba5400 100644 --- a/src/devices/transformServer/CMakeLists.txt +++ b/src/devices/transformServer/CMakeLists.txt @@ -14,8 +14,6 @@ yarp_prepare_plugin(transformServer if(NOT SKIP_transformServer) yarp_add_plugin(yarp_transformServer) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_transformServer PRIVATE FrameTransformServer.cpp FrameTransformServer.h) diff --git a/src/devices/usbCamera/CMakeLists.txt b/src/devices/usbCamera/CMakeLists.txt index 2d2de50eec1..7a91e23d75e 100644 --- a/src/devices/usbCamera/CMakeLists.txt +++ b/src/devices/usbCamera/CMakeLists.txt @@ -7,22 +7,20 @@ yarp_prepare_plugin(usbCamera CATEGORY device TYPE USBCameraDriverRgb - INCLUDE USBcamera.h + INCLUDE common/USBcamera.h EXTRA_CONFIG WRAPPER=grabberDual DEPENDS "UNIX;NOT APPLE;YARP_HAS_Libv4l2;YARP_HAS_Libv4lconvert;YARP_HAS_OpenCV") yarp_prepare_plugin(usbCameraRaw CATEGORY device TYPE USBCameraDriverRaw - INCLUDE USBcamera.h + INCLUDE common/USBcamera.h EXTRA_CONFIG WRAPPER=grabberDual DEPENDS "UNIX;NOT APPLE;YARP_HAS_Libv4l2;YARP_HAS_Libv4lconvert;YARP_HAS_OpenCV") if(ENABLE_usbCamera OR ENABLE_usbCameraRaw) yarp_add_plugin(yarp_usbCamera) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - target_sources(yarp_usbCamera PRIVATE common/USBcamera.cpp common/USBcamera.h linux/V4L_camera.cpp