diff options
| author | iainchesworth <iainchesworth@users.noreply.github.com> | 2020-09-25 04:32:55 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-24 11:32:55 -0700 |
| commit | de09af824147830ec7aad6fe1f2b743d00f8d93d (patch) | |
| tree | 164db509b24682b3925cf786c15ad2fec52a4344 /ports/tinyutf8/fixbuild.patch | |
| parent | 5d33bd3d7910c6090911f71f9dcf1a4eecd303da (diff) | |
| download | vcpkg-de09af824147830ec7aad6fe1f2b743d00f8d93d.tar.gz vcpkg-de09af824147830ec7aad6fe1f2b743d00f8d93d.zip | |
[tinyutf8] Updating to v4.0.2 (#13706)
Update DuffsDevice/tinyutf8 library from v3.0.1 to v4.0.2
Diffstat (limited to 'ports/tinyutf8/fixbuild.patch')
| -rw-r--r-- | ports/tinyutf8/fixbuild.patch | 72 |
1 files changed, 43 insertions, 29 deletions
diff --git a/ports/tinyutf8/fixbuild.patch b/ports/tinyutf8/fixbuild.patch index c1798ada1..a2008089d 100644 --- a/ports/tinyutf8/fixbuild.patch +++ b/ports/tinyutf8/fixbuild.patch @@ -1,29 +1,43 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4ec8787..cfea5b3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required(VERSION 3.1)
- project(tinyutf8)
-
--set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD 17)
-
- option(TINYUTF8_BUILD_STATIC "Build as static library" On)
-
-@@ -14,3 +14,14 @@ endif()
- add_library(tinyutf8 ${LIB_BUILD_TYPE} lib/tinyutf8.cpp)
-
- target_include_directories(tinyutf8 PUBLIC include)
-+
-+if(MSVC)
-+ ADD_DEFINITIONS(-D_UNICODE)
-+endif()
-+
-+install(TARGETS tinyutf8
-+ RUNTIME DESTINATION bin
-+ ARCHIVE DESTINATION lib
-+ LIBRARY DESTINATION lib)
-+
-+install(FILES include/tinyutf8.h DESTINATION include)
-\ No newline at end of file
+diff --git a/CMakeLists.txt b/CMakeLists.txt +index eef0c41..5d2c0d1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.1) + project(tinyutf8) + +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + + option(TINYUTF8_BUILD_STATIC "Build as static library" On) + +@@ -12,3 +12,14 @@ else() + endif() + + add_library(tinyutf8 ${LIB_BUILD_TYPE} tinyutf8.cpp) ++ ++if(MSVC) ++ ADD_DEFINITIONS(-D_UNICODE) ++endif() ++ ++install(TARGETS tinyutf8 ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib) ++ ++install(FILES tinyutf8.h DESTINATION include) +diff --git a/tinyutf8.cpp b/tinyutf8.cpp +index ca07b1e..502312f 100644 +--- a/tinyutf8.cpp ++++ b/tinyutf8.cpp +@@ -1,6 +1,6 @@ + #include "tinyutf8.h" + + // Explicit template instantiations for utf8_string +-template struct tiny_utf8::basic_utf8_string<>; +-template extern std::ostream& operator<<( std::ostream& stream , const tiny_utf8::basic_utf8_string<>& str ); +-template extern std::istream& operator>>( std::istream& stream , tiny_utf8::basic_utf8_string<>& str ); +\ No newline at end of file ++template class tiny_utf8::basic_utf8_string<>; ++extern template std::ostream& operator<<( std::ostream& stream , const tiny_utf8::basic_utf8_string<>& str ); ++extern template std::istream& operator>>( std::istream& stream , tiny_utf8::basic_utf8_string<>& str ); |