Skip to content

Commit 92a89a0

Browse files
Merge pull request #50 from PickNikRobotics/fix_build_farm
Fix ament GTest usage
2 parents 5781637 + d7bc8ab commit 92a89a0

File tree

1 file changed

+25
-12
lines changed

1 file changed

+25
-12
lines changed
Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,33 @@
11
# look for gtest from ROS, but do not fail if it is not found
22
find_package(gtest_vendor QUIET)
33

4-
# we must have gtest either from the ROS vendor (above) or on the system
5-
find_package(GTest REQUIRED)
4+
if(gtest_vendor_FOUND AND DATA_TAMER_BUILD_ROS)
5+
find_package(ament_cmake_gtest REQUIRED)
6+
ament_add_gtest(datatamer_test
7+
dt_tests.cpp
8+
custom_types_tests.cpp
9+
parser_tests.cpp)
610

7-
include(GoogleTest)
11+
target_include_directories(datatamer_test
12+
PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
813

9-
add_executable(datatamer_test
10-
dt_tests.cpp
11-
custom_types_tests.cpp
12-
parser_tests.cpp)
13-
gtest_discover_tests(datatamer_test DISCOVERY_MODE PRE_TEST)
14+
target_link_libraries(datatamer_test data_tamer)
15+
else()
16+
# we must have gtest either from the ROS vendor (above) or on the system
17+
find_package(GTest REQUIRED)
1418

15-
target_include_directories(datatamer_test
16-
PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
19+
include(GoogleTest)
1720

18-
target_link_libraries(datatamer_test data_tamer GTest::gtest_main)
21+
add_executable(datatamer_test
22+
dt_tests.cpp
23+
custom_types_tests.cpp
24+
parser_tests.cpp)
25+
gtest_discover_tests(datatamer_test DISCOVERY_MODE PRE_TEST)
1926

20-
add_test(NAME datatamer_test COMMAND $<TARGET_FILE:datatamer_test>)
27+
target_include_directories(datatamer_test
28+
PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
29+
30+
target_link_libraries(datatamer_test data_tamer GTest::gtest_main)
31+
32+
add_test(NAME datatamer_test COMMAND $<TARGET_FILE:datatamer_test>)
33+
endif()

0 commit comments

Comments
 (0)