From e946273950170f9427a980a7855017a1b4b65281 Mon Sep 17 00:00:00 2001 From: Zhihao Yuan Date: Tue, 9 Apr 2019 16:34:58 -0500 Subject: [PATCH] [PEGTL] Upgrade to 2.8.0 Migration guide: https://github.com/taocpp/PEGTL/blob/master/doc/Migration-Guide.md#version-280 --- ports/cppgraphqlgen/bigobj.patch | 12 ++++++++++++ ports/cppgraphqlgen/portfile.cmake | 2 ++ ports/pegtl/CONTROL | 4 ++-- ports/pegtl/portfile.cmake | 4 ++-- 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 ports/cppgraphqlgen/bigobj.patch diff --git a/ports/cppgraphqlgen/bigobj.patch b/ports/cppgraphqlgen/bigobj.patch new file mode 100644 index 0000000000..396dd58e6e --- /dev/null +++ b/ports/cppgraphqlgen/bigobj.patch @@ -0,0 +1,12 @@ +--- CMakeLists.txt.orig 2019-04-11 10:26:38.546721500 -0500 ++++ CMakeLists.txt 2019-04-11 10:27:19.863951400 -0500 +@@ -34,6 +34,9 @@ add_executable(schemagen + GraphQLTree.cpp + GraphQLResponse.cpp + SchemaGenerator.cpp) ++if(MSVC) ++ set_source_files_properties(GraphQLTree.cpp PROPERTIES COMPILE_FLAGS /bigobj) ++endif() + target_link_libraries(schemagen PRIVATE taocpp::pegtl) + target_include_directories(schemagen PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/include) diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 7444c39c51..ba3d6036d1 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF v2.1.0 SHA512 6fdeade25fc5c4af18d0288b80044a94cc9dcba9eed1640ec2cce06741b874f027930761964ed72073a25e083c0cf2fb828b9cf9732099c8a4f185776b1e1b8a HEAD_REF master + PATCHES + bigobj.patch ) vcpkg_configure_cmake( diff --git a/ports/pegtl/CONTROL b/ports/pegtl/CONTROL index 124e7ace7a..b890e1bc39 100644 --- a/ports/pegtl/CONTROL +++ b/ports/pegtl/CONTROL @@ -1,3 +1,3 @@ Source: pegtl -Version: 2.7.1 -Description: The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG). \ No newline at end of file +Version: 2.8.0 +Description: The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG). diff --git a/ports/pegtl/portfile.cmake b/ports/pegtl/portfile.cmake index 2de1f945de..1f53e73054 100644 --- a/ports/pegtl/portfile.cmake +++ b/ports/pegtl/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taocpp/pegtl - REF 2.7.1 - SHA512 fe89ef5a519f7b0070a8cfaf7d1a76f9a73e747065d872cc9434a31b2e77c12140d581b87fade9498c9db9d7867556b0c34fcd43f9d6e0946029d4886d291b21 + REF 2.8.0 + SHA512 1652b0061cd4cbd0e687855ee2e61e97d020606c54329de8769c3a3f411002323900c11eaf0da28e107c17e269025f577f9205b7500c5bbb16502687be8ee77b HEAD_REF master )