Skip to content

Commit

Permalink
CMakeLists.txt of devices'tests refactored in order to use new functi…
Browse files Browse the repository at this point in the history
…on create_device_test declared in YarpCatchUtils
  • Loading branch information
randaz81 committed Jan 18, 2023
1 parent 12e9402 commit 7931259
Show file tree
Hide file tree
Showing 130 changed files with 50 additions and 895 deletions.
4 changes: 2 additions & 2 deletions cmake/YarpCatchUtils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ endfunction()

function(create_device_test test_name)
if (DEFINED ${ARGV1})
set (extra_libs ${ARGV1})
set (extra_libs ${ARGV1})
endif()

add_executable(harness_dev_${test_name})
target_sources(harness_dev_${test_name}
PRIVATE
Expand Down
7 changes: 4 additions & 3 deletions src/devices/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

include(YarpPlugin)
include(YarpPrintFeature)
include(YarpCatchUtils)

yarp_begin_plugin_library(yarpmod
OPTION YARP_COMPILE_DEVICE_PLUGINS
Expand Down Expand Up @@ -86,9 +87,9 @@ yarp_begin_plugin_library(yarpmod
add_subdirectory(VirtualAnalogWrapper)
add_subdirectory(RGBDSensorClient)
add_subdirectory(RGBDSensor_nws_yarp)
add_subdirectory(ControlBoardWrapper)
add_subdirectory(ControlBoard_nws_yarp)
add_subdirectory(ControlBoardRemapper)
add_subdirectory(controlBoardWrapper)
add_subdirectory(controlBoard_nws_yarp)
add_subdirectory(controlBoardRemapper)
add_subdirectory(RobotDescriptionClient)
add_subdirectory(RobotDescriptionServer)
add_subdirectory(JoypadControlNetUtils)
Expand Down
27 changes: 0 additions & 27 deletions src/devices/ControlBoardRemapper/tests/CMakeLists.txt

This file was deleted.

26 changes: 0 additions & 26 deletions src/devices/ControlBoardWrapper/tests/CMakeLists.txt

This file was deleted.

26 changes: 0 additions & 26 deletions src/devices/ControlBoard_nws_yarp/tests/CMakeLists.txt

This file was deleted.

24 changes: 1 addition & 23 deletions src/devices/RGBDSensorClient/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,26 +1,4 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

include(YarpCatchUtils)



add_executable(harness_dev_RGBDSensorClient)

target_sources(harness_dev_RGBDSensorClient
PRIVATE
RGBDSensorClientTest.cpp
)

target_link_libraries(harness_dev_RGBDSensorClient
PRIVATE
YARP_harness
YARP::YARP_os
YARP::YARP_sig
YARP::YARP_dev
YARP::YARP_dev_tests
)

set_property(TARGET harness_dev_RGBDSensorClient PROPERTY FOLDER "Test")

yarp_catch_discover_tests(harness_dev_RGBDSensorClient)
create_device_test(RGBDSensorClient)
24 changes: 1 addition & 23 deletions src/devices/RGBDSensor_nws_yarp/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,26 +1,4 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

include(YarpCatchUtils)



add_executable(harness_dev_RGBDSensor_nws_yarp)

target_sources(harness_dev_RGBDSensor_nws_yarp
PRIVATE
RGBDSensor_nws_yarpTest.cpp
)

target_link_libraries(harness_dev_RGBDSensor_nws_yarp
PRIVATE
YARP_harness
YARP::YARP_os
YARP::YARP_sig
YARP::YARP_dev
YARP::YARP_dev_tests
)

set_property(TARGET harness_dev_RGBDSensor_nws_yarp PROPERTY FOLDER "Test")

yarp_catch_discover_tests(harness_dev_RGBDSensor_nws_yarp)
create_device_test(RGBDSensor_nws_yarp)
34 changes: 1 addition & 33 deletions src/devices/Rangefinder2DClient/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,38 +1,6 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

include(YarpCatchUtils)



add_executable(harness_dev_Rangefinder2DClient)

target_sources(harness_dev_Rangefinder2DClient
PRIVATE
Rangefinder2DClientTest.cpp
)

target_link_libraries(harness_dev_Rangefinder2DClient
PRIVATE
YARP_harness
YARP::YARP_os
YARP::YARP_sig
YARP::YARP_dev
YARP::YARP_dev_tests
)

if(TARGET YARP::YARP_math)
target_link_libraries(harness_dev_Rangefinder2DClient
PRIVATE
YARP::YARP_math
)
else()
set(_disabled_files
Rangefinder2DClientTest.cpp
)
set_source_files_properties(${_disabled_files} PROPERTIES HEADER_FILE_ONLY ON)
create_device_test(Rangefinder2DClient YARP::YARP_math)
endif()

set_property(TARGET harness_dev_Rangefinder2DClient PROPERTY FOLDER "Test")

yarp_catch_discover_tests(harness_dev_Rangefinder2DClient)
34 changes: 1 addition & 33 deletions src/devices/Rangefinder2D_nwc_yarp/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,38 +1,6 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

include(YarpCatchUtils)



add_executable(harness_dev_rangefinder2D_nwc_yarp)

target_sources(harness_dev_rangefinder2D_nwc_yarp
PRIVATE
Rangefinder2D_nwc_yarpTest.cpp
)

target_link_libraries(harness_dev_rangefinder2D_nwc_yarp
PRIVATE
YARP_harness
YARP::YARP_os
YARP::YARP_sig
YARP::YARP_dev
YARP::YARP_dev_tests
)

if(TARGET YARP::YARP_math)
target_link_libraries(harness_dev_rangefinder2D_nwc_yarp
PRIVATE
YARP::YARP_math
)
else()
set(_disabled_files
Rangefinder2D_nwc_yarpTest.cpp
)
set_source_files_properties(${_disabled_files} PROPERTIES HEADER_FILE_ONLY ON)
create_device_test(rangefinder2D_nwc_yarp YARP::YARP_math)
endif()

set_property(TARGET harness_dev_rangefinder2D_nwc_yarp PROPERTY FOLDER "Test")

yarp_catch_discover_tests(harness_dev_rangefinder2D_nwc_yarp)
26 changes: 3 additions & 23 deletions src/devices/Rangefinder2D_nws_yarp/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,26 +1,6 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

include(YarpCatchUtils)



add_executable(harness_dev_rangefinder2D_nws_yarp)

target_sources(harness_dev_rangefinder2D_nws_yarp
PRIVATE
Rangefinder2D_nws_yarpTest.cpp
)

target_link_libraries(harness_dev_rangefinder2D_nws_yarp
PRIVATE
YARP_harness
YARP::YARP_os
YARP::YARP_sig
YARP::YARP_dev
YARP::YARP_dev_tests
)

set_property(TARGET harness_dev_rangefinder2D_nws_yarp PROPERTY FOLDER "Test")

yarp_catch_discover_tests(harness_dev_rangefinder2D_nws_yarp)
if(TARGET YARP::YARP_math)
create_device_test(rangefinder2D_nws_yarp YARP::YARP_math)
endif()
24 changes: 1 addition & 23 deletions src/devices/RemoteControlBoard/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,26 +1,4 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

include(YarpCatchUtils)



add_executable(harness_dev_RemoteControlBoard)

target_sources(harness_dev_RemoteControlBoard
PRIVATE
RemoteControlBoardTest.cpp
)

target_link_libraries(harness_dev_RemoteControlBoard
PRIVATE
YARP_harness
YARP::YARP_os
YARP::YARP_sig
YARP::YARP_dev
YARP::YARP_dev_tests
)

set_property(TARGET harness_dev_RemoteControlBoard PROPERTY FOLDER "Test")

yarp_catch_discover_tests(harness_dev_RemoteControlBoard)
create_device_test(RemoteControlBoard)
24 changes: 1 addition & 23 deletions src/devices/RobotDescriptionClient/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,26 +1,4 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

include(YarpCatchUtils)



add_executable(harness_dev_robotDescriptionClient)

target_sources(harness_dev_robotDescriptionClient
PRIVATE
robotDescriptionClientTest.cpp
)

target_link_libraries(harness_dev_robotDescriptionClient
PRIVATE
YARP_harness
YARP::YARP_os
YARP::YARP_sig
YARP::YARP_dev
YARP::YARP_dev_tests
)

set_property(TARGET harness_dev_robotDescriptionClient PROPERTY FOLDER "Test")

yarp_catch_discover_tests(harness_dev_robotDescriptionClient)
create_device_test(robotDescriptionClient)
24 changes: 1 addition & 23 deletions src/devices/RobotDescriptionServer/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,26 +1,4 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

include(YarpCatchUtils)



add_executable(harness_dev_robotDescriptionServer)

target_sources(harness_dev_robotDescriptionServer
PRIVATE
robotDescriptionServerTest.cpp
)

target_link_libraries(harness_dev_robotDescriptionServer
PRIVATE
YARP_harness
YARP::YARP_os
YARP::YARP_sig
YARP::YARP_dev
YARP::YARP_dev_tests
)

set_property(TARGET harness_dev_robotDescriptionServer PROPERTY FOLDER "Test")

yarp_catch_discover_tests(harness_dev_robotDescriptionServer)
create_device_test(robotDescriptionServer)
5 changes: 5 additions & 0 deletions src/devices/controlBoardRemapper/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

create_device_test(controlBoardRemapper_t1)
create_device_test(controlBoardRemapper_t2)
File renamed without changes.
4 changes: 4 additions & 0 deletions src/devices/controlBoardWrapper/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

controlBoardRemapper (controlBoardWrapper)
4 changes: 4 additions & 0 deletions src/devices/controlBoard_nws_yarp/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

create_device_test(controlBoard_nws_yarp)
Loading

0 comments on commit 7931259

Please sign in to comment.