From 641a3d12f4023713edf76ee4771ab8d49d215efa Mon Sep 17 00:00:00 2001 From: Andrew Saba Date: Wed, 7 Aug 2019 16:25:15 -0400 Subject: [PATCH] Added check to see if testing is enabled to prevent build failures --- CMakeLists.txt | 64 +++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dec31bf..70f7793 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,45 +33,49 @@ add_definitions(--std=c++0x -Wall -Wextra -pedantic) cs_add_library(${PROJECT_NAME} src/eigen-checks.cc) find_package (Threads) -catkin_add_gtest(test_gtest_near - test/test_gtest-near.cc) -target_link_libraries(test_gtest_near ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) -catkin_add_gtest(test_gtest_equal - test/test_gtest-equal.cc) -target_link_libraries(test_gtest_equal ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) +# if testing is enabled +if (CATKIN_ENABLE_TESTING) + catkin_add_gtest(test_gtest_near + test/test_gtest-near.cc) + target_link_libraries(test_gtest_near ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) -catkin_add_gtest(test_gtest_zero - test/test_gtest-zero.cc) -target_link_libraries(test_gtest_zero ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) + catkin_add_gtest(test_gtest_equal + test/test_gtest-equal.cc) + target_link_libraries(test_gtest_equal ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) -catkin_add_gtest(test_gtest_equal_double - test/test_gtest-equal-double.cc) -target_link_libraries(test_gtest_equal_double ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) + catkin_add_gtest(test_gtest_zero + test/test_gtest-zero.cc) + target_link_libraries(test_gtest_zero ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) -catkin_add_gtest(test_glog_near - test/test_glog-near.cc) -target_link_libraries(test_glog_near ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) + catkin_add_gtest(test_gtest_equal_double + test/test_gtest-equal-double.cc) + target_link_libraries(test_gtest_equal_double ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) -catkin_add_gtest(test_glog_equal - test/test_glog-equal.cc) -target_link_libraries(test_glog_equal ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) + catkin_add_gtest(test_glog_near + test/test_glog-near.cc) + target_link_libraries(test_glog_near ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) -catkin_add_gtest(test_glog_zero - test/test_glog-zero.cc) -target_link_libraries(test_glog_zero ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) + catkin_add_gtest(test_glog_equal + test/test_glog-equal.cc) + target_link_libraries(test_glog_equal ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) -catkin_add_gtest(test_glog_equal_double - test/test_glog-equal-double.cc) -target_link_libraries(test_glog_equal_double ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) + catkin_add_gtest(test_glog_zero + test/test_glog-zero.cc) + target_link_libraries(test_glog_zero ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) -catkin_add_gtest(test_glog-zero-sized-types - test/test_glog-zero-sized-types.cc) -target_link_libraries(test_glog-zero-sized-types ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) + catkin_add_gtest(test_glog_equal_double + test/test_glog-equal-double.cc) + target_link_libraries(test_glog_equal_double ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) -catkin_add_gtest(test_gtest-zero-sized-types - test/test_gtest-zero-sized-types.cc) -target_link_libraries(test_gtest-zero-sized-types ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) + catkin_add_gtest(test_glog-zero-sized-types + test/test_glog-zero-sized-types.cc) + target_link_libraries(test_glog-zero-sized-types ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) + + catkin_add_gtest(test_gtest-zero-sized-types + test/test_gtest-zero-sized-types.cc) + target_link_libraries(test_gtest-zero-sized-types ${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT}) +endif() cs_install()