From cf777ec09ceb3c4a72dc30271cfec72320e55e76 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Fri, 4 Oct 2019 13:52:42 +0200 Subject: [PATCH] Remove automatic test subdir inclusion. Too complex and might cause problems some day. --- tests/CMakeLists.txt | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 890a12aba..8ed5d6559 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -27,20 +27,6 @@ add_library(test_gtest_common INTERFACE) target_compile_definitions(test_gtest_common INTERFACE TEST_DATA_DIR="${TEST_DATA_DIR}") target_link_libraries(test_gtest_common INTERFACE GTest::GTest GTest::Main) -macro(subdirlist result curdir) - file(GLOB children RELATIVE ${curdir} ${curdir}/*) - set(dirlist "") - foreach(child ${children}) - if(IS_DIRECTORY ${curdir}/${child} AND NOT ${child} STREQUAL "catch2" ) - list(APPEND dirlist ${child}) - endif() - endforeach() - set(${result} ${dirlist}) -endmacro() - -subdirlist(SUBDIRS ${CMAKE_CURRENT_LIST_DIR}) - -foreach(subdir ${SUBDIRS}) - add_subdirectory(${subdir}) -endforeach() +add_subdirectory(libnest2d) +add_subdirectory(timeutils)