From 7b458fa31de793c6d033969c3f81c1126d28157d Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Wed, 4 Dec 2019 13:06:48 +0100
Subject: [PATCH] [CMake] Fix usage of BUILD_TESTING + target_link_libraries
---
CMakeLists.txt | 5 ++---
test/CMakeLists.txt | 13 ++++++++-----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9e8bcdd..d0a563a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,6 +59,7 @@ include(cmake/python.cmake)
include(cmake/hpp.cmake)
include(cmake/apple.cmake)
include(cmake/ide.cmake)
+include(cmake/test.cmake)
# If needed, fix CMake policy for APPLE systems
APPLY_DEFAULT_APPLE_CONFIGURATION()
@@ -156,9 +157,7 @@ add_subdirectory(src)
if (BUILD_PYTHON_INTERFACE)
add_subdirectory(python)
endif ()
-if (BUILD_TESTING)
- add_subdirectory(test)
-endif ()
+add_subdirectory(test)
pkg_config_append_libs("hpp-fcl")
PKG_CONFIG_APPEND_BOOST_LIBS(thread date_time filesystem system)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6a6f1d27..a98c362e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,16 +1,15 @@
config_files(fcl_resources/config.h)
-macro(add_fcl_test test_name)
- add_executable(${ARGV})
+macro(add_fcl_test test_name source)
+ ADD_UNIT_TEST(${test_name} ${source})
target_link_libraries(${test_name}
PUBLIC
- ${PROJECT_NAME}
+ hpp-fcl
${Boost_LIBRARIES}
Boost::unit_test_framework
utility
)
PKG_CONFIG_USE_DEPENDENCY(${test_name} assimp)
- add_test(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
target_compile_options(${test_name} PRIVATE "-Wno-c99-extensions")
endmacro(add_fcl_test)
@@ -54,7 +53,11 @@ if(HPP_FCL_HAVE_OCTOMAP)
endif(HPP_FCL_HAVE_OCTOMAP)
## Benchmark
-add_executable(test-benchmark benchmark.cpp)
+IF(BUILD_TESTING)
+ add_executable(test-benchmark benchmark.cpp)
+ELSE()
+ add_executable(test-benchmark EXCLUDE_FROM_ALL benchmark.cpp)
+ENDIF()
target_link_libraries(test-benchmark
PUBLIC
utility
--
GitLab