aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffin Downs <35574547+grdowns@users.noreply.github.com>2019-04-12 03:45:36 -0700
committerGitHub <noreply@github.com>2019-04-12 03:45:36 -0700
commitc5d80fdffb5165828c50ed04e73c827ac1e4dc9c (patch)
tree537f6e839f0fe72827482a72db9da472fa1b7223
parent637963244b5442d41f876b41f2622654e88f3074 (diff)
parente946273950170f9427a980a7855017a1b4b65281 (diff)
downloadvcpkg-c5d80fdffb5165828c50ed04e73c827ac1e4dc9c.tar.gz
vcpkg-c5d80fdffb5165828c50ed04e73c827ac1e4dc9c.zip
Merge pull request #6024 from zhihaoy/pegtl
[PEGTL] Upgrade to 2.8.0
-rw-r--r--ports/cppgraphqlgen/bigobj.patch12
-rw-r--r--ports/cppgraphqlgen/portfile.cmake2
-rw-r--r--ports/pegtl/CONTROL4
-rw-r--r--ports/pegtl/portfile.cmake4
4 files changed, 18 insertions, 4 deletions
diff --git a/ports/cppgraphqlgen/bigobj.patch b/ports/cppgraphqlgen/bigobj.patch
new file mode 100644
index 000000000..396dd58e6
--- /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 7444c39c5..ba3d6036d 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 124e7ace7..b890e1bc3 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 2de1f945d..1f53e7305 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
)