SHA256
8
0
forked from pool/utfcpp

Accepting request 976436 from Java:packages

Allow building on SLE-12-SP5

OBS-URL: https://build.opensuse.org/request/show/976436
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/utfcpp?expand=0&rev=12
This commit is contained in:
2022-05-16 08:45:58 +00:00
committed by Git OBS Bridge
parent 9fcbffe397
commit 42bd253acb
3 changed files with 48 additions and 3 deletions

34
no-cpp17-tests.patch Normal file
View File

@@ -0,0 +1,34 @@
diff -urEbwB utfcpp-3.2.1/tests/CMakeLists.txt utfcpp-3.2.1.new/tests/CMakeLists.txt
--- utfcpp-3.2.1/tests/CMakeLists.txt 2021-06-06 17:09:04.000000000 +0200
+++ utfcpp-3.2.1.new/tests/CMakeLists.txt 2021-07-27 23:56:21.956315062 +0200
@@ -1,6 +1,5 @@
add_executable(negative ${PROJECT_SOURCE_DIR}/tests/negative.cpp)
add_executable(cpp11 ${PROJECT_SOURCE_DIR}/tests/test_cpp11.cpp)
-add_executable(cpp17 ${PROJECT_SOURCE_DIR}/tests/test_cpp17.cpp)
add_executable(apitests
${PROJECT_SOURCE_DIR}/tests/test_checked_api.cpp
${PROJECT_SOURCE_DIR}/tests/test_unchecked_api.cpp
@@ -15,7 +14,6 @@
target_link_libraries(negative PRIVATE utf8::cpp)
target_link_libraries(cpp11 PRIVATE utf8::cpp)
-target_link_libraries(cpp17 PRIVATE utf8::cpp)
target_link_libraries(apitests PRIVATE utf8::cpp)
target_link_libraries(noexceptionstests PRIVATE utf8::cpp)
@@ -33,15 +31,8 @@
CXX_STANDARD_REQUIRED YES
CXX_EXTENSIONS NO)
-set_target_properties(cpp17
- PROPERTIES
- CXX_STANDARD 17
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO)
-
add_test(negative_test negative ${PROJECT_SOURCE_DIR}/tests/test_data/utf8_invalid.txt)
add_test(cpp11_test cpp11)
-add_test(cpp17_test cpp17)
add_test(api_test apitests)
add_test(noexceptions_test noexceptionstests)