From c50159e176db4d47c0939c4998cf82ac9a9ff6c0 Mon Sep 17 00:00:00 2001 From: Vissarion Fisikopoulos Date: Thu, 5 Sep 2024 16:17:21 +0300 Subject: [PATCH] [cmake] Add optional variable to boost_geometry_add_unit_test --- test/CMakeLists.txt | 10 +++++----- test/cs_undefined/CMakeLists.txt | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 71ad122926..d3bc6f7ece 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -42,13 +42,13 @@ function(boost_geometry_add_unit_test prefix item) target_compile_features(${unit_test_name} PRIVATE cxx_std_14) # To be able to run ctest - if (NOT ("boost_geometry_${prefix}_${item}" STREQUAL "boost_geometry_cs_undefined_setops1") AND - NOT ("boost_geometry_${prefix}_${item}" STREQUAL "boost_geometry_cs_undefined_setops2")) - add_test(NAME ${unit_test_name} COMMAND ${unit_test_name}) - endif() + add_test(NAME ${unit_test_name} COMMAND ${unit_test_name}) # Add a dependency to the global tests target - add_dependencies(tests ${unit_test_name}) + set(extra_macro_args ${ARGN}) + if (NOT extra_macro_args STREQUAL "not_run") + add_dependencies(tests ${unit_test_name}) + endif() # Inform the caller about the test name. It can then set defines, if necessary. set(BOOST_GEOMETRY_UNIT_TEST_NAME ${unit_test_name} PARENT_SCOPE) diff --git a/test/cs_undefined/CMakeLists.txt b/test/cs_undefined/CMakeLists.txt index f4110499f7..bd7857c329 100644 --- a/test/cs_undefined/CMakeLists.txt +++ b/test/cs_undefined/CMakeLists.txt @@ -14,8 +14,9 @@ foreach(item IN ITEMS other relops1 relops2 - setops1 - setops2 ) boost_geometry_add_unit_test("cs_undefined" ${item}) endforeach() + +#boost_geometry_add_unit_test("cs_undefined" setops1 "not_run") +#boost_geometry_add_unit_test("cs_undefined" setops2 "not_run")