|
|
@@ -153,12 +153,12 @@ message("${PROJECT_NAME}: Adding additional cmake dependencies...")
|
|
|
if (${LS_STD_BUILD_WITH_TESTS})
|
|
|
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/test/lib/${GOOGLE_TEST_MODULE})
|
|
|
|
|
|
- target_compile_options(gtest PRIVATE -Wno-error -Wno-character-conversion)
|
|
|
- target_compile_options(gmock PRIVATE -Wno-error -Wno-character-conversion)
|
|
|
-
|
|
|
if (APPLE AND ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
|
|
|
message("${PROJECT_NAME}: Set Google Test Apple SDK with LLVM Clang...")
|
|
|
|
|
|
+ target_compile_options(gtest PRIVATE -Wno-error -Wno-character-conversion)
|
|
|
+ target_compile_options(gmock PRIVATE -Wno-error -Wno-character-conversion)
|
|
|
+
|
|
|
target_compile_options(gtest PRIVATE ${SDK_LIBCXX_FLAGS})
|
|
|
target_compile_options(gmock PRIVATE ${SDK_LIBCXX_FLAGS})
|
|
|
endif ()
|
|
|
@@ -262,6 +262,8 @@ endif ()
|
|
|
if (${LS_STD_BUILD_WITH_TESTS})
|
|
|
message("${MODULE_NAME_BOXING}: Building unit tests...")
|
|
|
add_executable(${MODULE_NAME_BOXING}-unit-test ${UNIT_TEST_FILES_BOXING})
|
|
|
+
|
|
|
+ target_compile_features("${MODULE_NAME_BOXING}-unit-test" PUBLIC cxx_std_20)
|
|
|
endif ()
|
|
|
|
|
|
##########################################################
|
|
|
@@ -335,6 +337,8 @@ if (${LS_STD_BUILD_WITH_TESTS})
|
|
|
${UNIT_TEST_FILES_IO}
|
|
|
${UNIT_TEST_FILES_SERIALIZATION}
|
|
|
${UNIT_TEST_FILES_TIME})
|
|
|
+
|
|
|
+ target_compile_features("${PROJECT_NAME}-unit-test" PUBLIC cxx_std_20)
|
|
|
else ()
|
|
|
message("${PROJECT_NAME}: Building unit tests...")
|
|
|
add_executable(${PROJECT_NAME}-unit-test
|
|
|
@@ -347,6 +351,8 @@ if (${LS_STD_BUILD_WITH_TESTS})
|
|
|
${UNIT_TEST_FILES_IO}
|
|
|
${UNIT_TEST_FILES_SERIALIZATION}
|
|
|
${UNIT_TEST_FILES_TIME})
|
|
|
+
|
|
|
+ target_compile_features("${PROJECT_NAME}-unit-test" PUBLIC cxx_std_20)
|
|
|
endif ()
|
|
|
endif ()
|
|
|
|
|
|
@@ -406,6 +412,8 @@ if (${LS_STD_BUILD_WITH_TESTS})
|
|
|
${INTEGRATION_TEST_FILES_IO}
|
|
|
${UNIT_TEST_FILES_SERIALIZATION}
|
|
|
${UNIT_TEST_FILES_TIME})
|
|
|
+
|
|
|
+ target_compile_features("${PROJECT_NAME}-test" PUBLIC cxx_std_20)
|
|
|
else ()
|
|
|
message("${PROJECT_NAME}: Building all tests with JNI support...")
|
|
|
add_executable(${PROJECT_NAME}-test
|
|
|
@@ -419,6 +427,8 @@ if (${LS_STD_BUILD_WITH_TESTS})
|
|
|
${INTEGRATION_TEST_FILES_IO}
|
|
|
${UNIT_TEST_FILES_SERIALIZATION}
|
|
|
${UNIT_TEST_FILES_TIME})
|
|
|
+
|
|
|
+ target_compile_features("${PROJECT_NAME}-test" PUBLIC cxx_std_20)
|
|
|
endif ()
|
|
|
endif ()
|
|
|
|