[utfcpp] Update to 3.2.1 version (#18299)

* [utfcpp] Update to 3.2.1 version

* [utfcpp] Update version files

Co-authored-by: Rémy Tassoux <rt2@rasterizedworld.com>
This commit is contained in:
Rémy Tassoux 2021-06-11 17:59:54 +02:00 committed by GitHub
parent 6ece598d97
commit b7644f0546
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 46 deletions

View File

@ -1,5 +0,0 @@
Source: utfcpp
Version: 3.1.2
Port-Version: 1
Homepage: https://github.com/nemtrif/utfcpp
Description: UTF-8 with C++ in a Portable Way

View File

@ -1,36 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ac1646..c081d3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,6 @@ endif()
if(UTF8_TESTS)
enable_testing()
- add_subdirectory(extern/gtest)
+ find_package(GTest CONFIG REQUIRED)
add_subdirectory(tests)
endif()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 06e0d7e..4ee6dd8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -15,16 +15,16 @@ add_executable(noexceptionstests
target_link_libraries(negative PRIVATE utf8::cpp)
target_link_libraries(cpp11 PRIVATE
utf8::cpp
- gtest_main
+ GTest::gtest_main
)
target_link_libraries(apitests PRIVATE
utf8::cpp
- gtest_main
+ GTest::gtest_main
)
target_link_libraries(noexceptionstests PRIVATE
utf8::cpp
- gtest_main
+ GTest::gtest_main
)
target_compile_options(noexceptionstests PUBLIC -fno-exceptions)

View File

@ -1,10 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO nemtrif/utfcpp
REF v3.1.2
SHA512 d43df19d9e8652291f1301a326ec0d592bad43d6ecf9086947037f0ae0c1e70c2d96082c48066639e2b7c57c0ea0e4782d6b215d017cf96a4c73ff3a15feec75
REF v3.2.1
SHA512 5798487f12b1bc55d3e06aed38f7604271ca3402963efcf85d181fd590d8a088d21e961e77698e60dc2cdae8cf4506645903442c45fd328201752d9589180e0d
HEAD_REF master
PATCHES fix-test.patch
)
vcpkg_configure_cmake(

6
ports/utfcpp/vcpkg.json Normal file
View File

@ -0,0 +1,6 @@
{
"name": "utfcpp",
"version": "3.2.1",
"description": "UTF-8 with C++ in a Portable Way",
"homepage": "https://github.com/nemtrif/utfcpp"
}

View File

@ -6433,8 +6433,8 @@
"port-version": 0
},
"utfcpp": {
"baseline": "3.1.2",
"port-version": 1
"baseline": "3.2.1",
"port-version": 0
},
"utfz": {
"baseline": "1.2-1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "27a1e587de353ed0d9559d5e4627ed2811960c07",
"version": "3.2.1",
"port-version": 0
},
{
"git-tree": "1af9d7ac0523916f6119657b78719d84939215d5",
"version-string": "3.1.2",