Use 2.x.y structure for tests CMakeLists.txt

Author: Morwenn

tests/CMakeLists.txt

@@ -1,3 +1,4 @@
+include(CTest)
 include(DownloadProject)
 
 # Download and configure Catch2 for the tests
@@ -7,6 +8,7 @@ download_project(PROJ Catch2
                  UPDATE_DISCONNECTED 1
 )
 list(APPEND CMAKE_MODULE_PATH ${Catch2_SOURCE_DIR}/contrib)
+include(ParseAndAddCatchTests)
 
 # Configure Catch2 so that it looks like a proper target
 add_library(Catch2 INTERFACE)
@@ -20,6 +22,15 @@ target_include_directories(Catch2 INTERFACE
 option(GFX_TIMSORT_USE_VALGRIND "Whether to run the tests with Valgrind" OFF)
 set(GFX_TIMSORT_SANITIZE "" CACHE STRING "Comma-separated list of options to pass to -fsanitize")
 
+# Configure Valgrind
+if (${GFX_TIMSORT_USE_VALGRIND})
+    find_program(MEMORYCHECK_COMMAND valgrind)
+    set(MEMORYCHECK_COMMAND_OPTIONS "--leak-check=full --track-origins=yes --error-exitcode=1 --show-reachable=no")
+    if (APPLE)
+        set(MEMORYCHECK_SUPPRESSIONS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/valgrind-osx.supp)
+    endif()
+endif()
+
 macro(configure_tests target)
     # Add required dependencies to tests
     target_link_libraries(${target} PRIVATE
@@ -79,26 +90,13 @@ add_executable(cxx_98_tests
 )
 configure_tests(cxx_98_tests)
 target_compile_features(cxx_98_tests PRIVATE cxx_std_98)
+ParseAndAddCatchTests(cxx_98_tests)
 
-# Tests that require C++11 support to run
+# Tests that require C++11 support
 add_executable(cxx_11_tests
     main.cpp
     cxx_11_tests.cpp
 )
 configure_tests(cxx_11_tests)
 target_compile_features(cxx_11_tests PRIVATE cxx_std_11)
-
-# Configure Valgrind
-if (${GFX_TIMSORT_USE_VALGRIND})
-    find_program(MEMORYCHECK_COMMAND valgrind)
-    set(MEMORYCHECK_COMMAND_OPTIONS "--leak-check=full --track-origins=yes --error-exitcode=1 --show-reachable=no")
-    if (APPLE)
-        set(MEMORYCHECK_SUPPRESSIONS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/valgrind-osx.supp)
-    endif()
-endif()
-
-include(CTest)
-include(ParseAndAddCatchTests)
-
-ParseAndAddCatchTests(cxx_98_tests)
 ParseAndAddCatchTests(cxx_11_tests)