From 20226319d30e292958627953b10736ba250668ce Mon Sep 17 00:00:00 2001 From: Joris Vaillant <joris.vaillant@inria.fr> Date: Fri, 12 Jul 2024 17:09:20 +0200 Subject: [PATCH] cmake: Prefix all test target by eigenpy- --- unittest/CMakeLists.txt | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt index 8d6571d1..586c1302 100644 --- a/unittest/CMakeLists.txt +++ b/unittest/CMakeLists.txt @@ -2,31 +2,32 @@ # Copyright (c) 2014-2019 CNRS Copyright (c) 2018-2024 INRIA # -macro(ADD_LIB_UNIT_TEST test) +function(ADD_LIB_UNIT_TEST test) create_ctest_build_tests_target() + set(test_target ${PROJECT_NAME}-${test}) if(BUILD_TESTING) - add_library(${test} SHARED "${test}.cpp") + add_library(${test_target} SHARED "${test}.cpp") else(BUILD_TESTING) - add_library(${test} SHARED EXCLUDE_FROM_ALL "${test}.cpp") + add_library(${test_target} SHARED EXCLUDE_FROM_ALL "${test}.cpp") endif(BUILD_TESTING) - set_standard_output_directory(${test}) + set_standard_output_directory(${test_target}) - target_link_libraries(${test} PUBLIC ${PROJECT_NAME}) - set_target_properties(${test} PROPERTIES PREFIX "") + target_link_libraries(${test_target} PUBLIC ${PROJECT_NAME}) + set_target_properties(${test_target} PROPERTIES PREFIX "") - set_target_properties(${test} PROPERTIES SUFFIX ${PYTHON_EXT_SUFFIX}) + set_target_properties(${test_target} PROPERTIES SUFFIX ${PYTHON_EXT_SUFFIX}) add_test( - NAME ${test} + NAME ${test_target} COMMAND ${PYTHON_EXECUTABLE} -c "import ${test}" - WORKING_DIRECTORY $<TARGET_FILE_DIR:${test}>) + WORKING_DIRECTORY $<TARGET_FILE_DIR:${test_target}>) - add_dependencies(build_tests ${test}) + add_dependencies(build_tests ${test_target}) if(NOT BUILD_TESTING) - set_tests_properties(${test} PROPERTIES DEPENDS ctest_build_tests) + set_tests_properties(${test_target} PROPERTIES DEPENDS ctest_build_tests) endif(NOT BUILD_TESTING) -endmacro(ADD_LIB_UNIT_TEST) +endfunction() add_dependencies(build_tests ${PYWRAP}) add_lib_unit_test(matrix) @@ -58,17 +59,20 @@ if(CMAKE_CXX_STANDARD GREATER 14 AND CMAKE_CXX_STANDARD LESS 98) endif() function(add_python_lib_unit_test name source) - add_python_unit_test(${name} ${source} "lib" "bin") + set(test_target ${PROJECT_NAME}-${name}) + add_python_unit_test(${test_target} ${source} "lib" "bin") endfunction() function(add_python_eigenpy_lib_unit_test name source) - add_python_unit_test(${name} ${source} "lib" "bin" "python") - set_tests_properties(${name} PROPERTIES DEPENDS ${PYWRAP}) + set(test_target ${PROJECT_NAME}-${name}) + add_python_unit_test(${test_target} ${source} "lib" "bin" "python") + set_tests_properties(${test_target} PROPERTIES DEPENDS ${PYWRAP}) endfunction() function(add_python_eigenpy_unit_test name source) - add_python_unit_test(${name} ${source} "python") - set_tests_properties(${name} PROPERTIES DEPENDS ${PYWRAP}) + set(test_target ${PROJECT_NAME}-${name}) + add_python_unit_test(${test_target} ${source} "python") + set_tests_properties(${test_target} PROPERTIES DEPENDS ${PYWRAP}) endfunction() function(config_test test tagname opttype) @@ -80,7 +84,7 @@ function(config_test test tagname opttype) configure_file(python/test_${test}.py.in ${CMAKE_CURRENT_BINARY_DIR}/python/${py_file}) add_lib_unit_test(${MODNAME}) - set(PYTHON_TEST_NAME "py-${test}-${tagname}") + set(PYTHON_TEST_NAME "${PROJECT_NAME}-py-${test}-${tagname}") add_test(NAME ${PYTHON_TEST_NAME} COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/python/${py_file}") -- GitLab