@@ -9,8 +9,7 @@ option(FASTFLOAT_SUPPLEMENTAL_TESTS "Run supplemental tests" ON)
99
1010if (NOT SYSTEM_DOCTEST)
1111 FetchContent_Declare (doctest
12- GIT_REPOSITORY https://github.com/onqtam/doctest.git
13- GIT_TAG v2.4.11)
12+ GIT_REPOSITORY https://github.com/lemire/doctest.git)
1413else ()
1514 find_package (doctest REQUIRED )
1615endif ()
@@ -27,20 +26,15 @@ endif()
2726if (NOT SYSTEM_DOCTEST)
2827 FetchContent_GetProperties (doctest)
2928 if (NOT doctest_POPULATED)
30- FetchContent_Populate (doctest)
31- add_subdirectory (${doctest_SOURCE_DIR} ${doctest_BINARY_DIR} )
29+ FetchContent_MakeAvailable (doctest)
3230 endif ()
3331endif ()
3432
3533add_library (supplemental-data INTERFACE )
3634if (FASTFLOAT_SUPPLEMENTAL_TESTS)
37- FetchContent_GetProperties (supplemental_test_files)
38- if (NOT supplemental_test_files_POPULATED)
39- message (STATUS "Supplemental tests enabled. Retrieving test files." )
40- FetchContent_Populate (supplemental_test_files)
41- message (STATUS "Supplemental test files retrieved." )
42- add_subdirectory (${supplemental_test_files_SOURCE_DIR} ${supplemental_test_files_BINARY_DIR} )
43- endif ()
35+ message (STATUS "Supplemental tests enabled. Retrieving test files." )
36+ FetchContent_MakeAvailable (supplemental_test_files)
37+ message (STATUS "Supplemental test files retrieved." )
4438 target_compile_definitions (supplemental-data INTERFACE SUPPLEMENTAL_TEST_DATA_DIR= "${supplemental_test_files_BINARY_DIR} /data" )
4539endif ()
4640
0 commit comments