Skip to content

Commit 40bb1ab

Browse files
Revert commit and eliminate BUILD_TESTING check
1 parent 47de5c0 commit 40bb1ab

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

tests/CMakeLists.txt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ set(TEST_DEPENDECIES
3838
foonathan::lexy
3939
bt_sample_nodes)
4040

41-
if(ament_cmake_FOUND AND BUILD_TESTING)
41+
if(ament_cmake_FOUND)
4242

4343
find_package(ament_cmake_gtest REQUIRED)
4444

@@ -55,7 +55,7 @@ elseif(catkin_FOUND AND CATKIN_ENABLE_TESTING)
5555
Threads::Threads
5656
${catkin_LIBRARIES})
5757

58-
elseif(NOT ament_cmake_FOUND AND NOT catkin_FOUND)
58+
else()
5959

6060
find_package(GTest REQUIRED)
6161
enable_testing()
@@ -69,9 +69,5 @@ elseif(NOT ament_cmake_FOUND AND NOT catkin_FOUND)
6969

7070
endif()
7171

72-
if(TARGET ${BT_CPP_LIBRARY}_test)
73-
74-
target_include_directories(${BTCPP_LIBRARY}_test PRIVATE include ${PROJECT_SOURCE_DIR}/3rdparty)
75-
target_compile_definitions(${BTCPP_LIBRARY}_test PRIVATE BT_TEST_FOLDER="${CMAKE_CURRENT_SOURCE_DIR}")
76-
77-
endif()
72+
target_include_directories(${BTCPP_LIBRARY}_test PRIVATE include ${PROJECT_SOURCE_DIR}/3rdparty)
73+
target_compile_definitions(${BTCPP_LIBRARY}_test PRIVATE BT_TEST_FOLDER="${CMAKE_CURRENT_SOURCE_DIR}")

0 commit comments

Comments
 (0)