From 6033320a1a8b93fe14a86afed1ba49e969959e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?= =?UTF-8?q?=D0=A9=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Fri, 5 Mar 2021 22:04:53 +0500 Subject: [PATCH] Added options for testing --- CMakeLists.txt | 4 ++++ test/CMakeLists.txt | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 54742e9..01a07b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,10 @@ else() option(GHC_FILESYSTEM_BUILD_TESTING "Enable tests" OFF) option(GHC_FILESYSTEM_WITH_INSTALL "With install target" ON) endif() +option(GHC_FILESYSTEM_BUILD_STD_TESTING "Enable STD tests" ${GHC_FILESYSTEM_BUILD_TESTING}) +if(NOT DEFINED GHC_FILESYSTEM_TEST_COMPILE_FEATURES) + set(GHC_FILESYSTEM_TEST_COMPILE_FEATURES ${CMAKE_CXX_COMPILE_FEATURES}) +endif() if(NOT DEFINED CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 11) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 3ad4271..1bc5568 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -29,7 +29,9 @@ else() set_target_properties(filesystem_test PROPERTIES LINK_FLAGS "-g4 -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1") endif() ParseAndAddCatchTests(filesystem_test) - AddExecutableWithStdFS(std_filesystem_test filesystem_test.cpp catch.hpp) + if(GHC_FILESYSTEM_BUILD_STD_TESTING) + AddExecutableWithStdFS(std_filesystem_test filesystem_test.cpp catch.hpp) + endif() if(WIN32) add_executable(filesystem_test_char filesystem_test.cpp catch.hpp) target_link_libraries(filesystem_test_char ghc_filesystem) @@ -44,10 +46,10 @@ else() endif() ParseAndAddCatchTests(filesystem_test_char) endif() - if("cxx_std_17" IN_LIST CMAKE_CXX_COMPILE_FEATURES) + if("cxx_std_17" IN_LIST GHC_FILESYSTEM_TEST_COMPILE_FEATURES) AddTestExecutableWithStdCpp(17 filesystem_test.cpp catch.hpp) endif() - if("cxx_std_20" IN_LIST CMAKE_CXX_COMPILE_FEATURES) + if("cxx_std_20" IN_LIST GHC_FILESYSTEM_TEST_COMPILE_FEATURES) AddTestExecutableWithStdCpp(20 filesystem_test.cpp catch.hpp) endif() endif()