From 858b2973327b634872ae61f0bfeedc0fb762dde9 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Tue, 23 Apr 2019 15:19:51 -0700 Subject: [cppgraphqlgen] Update cppgraphqlgen and PEGTL to 3.0.0 (#6162) Upgrade PEGTL to 3.0.0-prerelease Update cppgraphqlgen to 3.0.0 Add pegtl-2 port --- ports/cppgraphqlgen/CONTROL | 4 ++-- ports/cppgraphqlgen/bigobj.patch | 12 ------------ ports/cppgraphqlgen/portfile.cmake | 14 +++++++------- 3 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 ports/cppgraphqlgen/bigobj.patch (limited to 'ports/cppgraphqlgen') diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL index d2c09e78b..c354edbab 100644 --- a/ports/cppgraphqlgen/CONTROL +++ b/ports/cppgraphqlgen/CONTROL @@ -1,4 +1,4 @@ Source: cppgraphqlgen -Version: 2.1.0 -Build-Depends: pegtl, rapidjson +Version: 3.0.0-pre +Build-Depends: boost-filesystem (!uwp&!windows), boost-program-options, pegtl, rapidjson Description: C++ GraphQL schema service generator diff --git a/ports/cppgraphqlgen/bigobj.patch b/ports/cppgraphqlgen/bigobj.patch deleted file mode 100644 index 396dd58e6..000000000 --- a/ports/cppgraphqlgen/bigobj.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 ba3d6036d..3cd60f9a2 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -3,25 +3,25 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/cppgraphqlgen - REF v2.1.0 - SHA512 6fdeade25fc5c4af18d0288b80044a94cc9dcba9eed1640ec2cce06741b874f027930761964ed72073a25e083c0cf2fb828b9cf9732099c8a4f185776b1e1b8a + REF 692dcca912ec7383f80bfd2d922ff4e7c1a754b7 + SHA512 8134fba7296a3c1af14fd35bf119e7706498941bf91554bc8c832bdc806b2770759eb20af79f165ebbeb3b4bd4642e74c30ec10f23c1ccd2cb759a0ffc7646bb HEAD_REF master - PATCHES - bigobj.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DBUILD_TESTS=OFF -DUPDATE_SAMPLES=OFF - OPTIONS_RELEASE -DCMAKE_INSTALL_CONFIGDIR=${CURRENT_PACKAGES_DIR}/share/cppgraphqlgen -DCMAKE_INSTALL_TOOLSDIR=${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen - OPTIONS_DEBUG -DCMAKE_INSTALL_CONFIGDIR=${CURRENT_PACKAGES_DIR}/debug/share/cppgraphqlgen -DCMAKE_INSTALL_TOOLSDIR=${CURRENT_PACKAGES_DIR}/debug/tools/cppgraphqlgen + OPTIONS -DGRAPHQL_BUILD_TESTS=OFF -DGRAPHQL_UPDATE_SAMPLES=OFF + OPTIONS_RELEASE -DGRAPHQL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share -DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/tools + OPTIONS_DEBUG -DGRAPHQL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share -DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/debug/tools ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen) + vcpkg_copy_pdbs() configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/cppgraphqlgen/copyright COPYONLY) -- cgit v1.2.3 From f40b738108debddce5176d88c32db6a815863f4c Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Tue, 7 May 2019 14:13:27 -0700 Subject: [cppgraphqlgen] Update to 3.0.0 release (#6337) --- ports/cppgraphqlgen/CONTROL | 2 +- ports/cppgraphqlgen/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ports/cppgraphqlgen') diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL index c354edbab..d3f13de82 100644 --- a/ports/cppgraphqlgen/CONTROL +++ b/ports/cppgraphqlgen/CONTROL @@ -1,4 +1,4 @@ Source: cppgraphqlgen -Version: 3.0.0-pre +Version: 3.0.0 Build-Depends: boost-filesystem (!uwp&!windows), boost-program-options, pegtl, rapidjson Description: C++ GraphQL schema service generator diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 3cd60f9a2..5c92e1a60 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/cppgraphqlgen - REF 692dcca912ec7383f80bfd2d922ff4e7c1a754b7 - SHA512 8134fba7296a3c1af14fd35bf119e7706498941bf91554bc8c832bdc806b2770759eb20af79f165ebbeb3b4bd4642e74c30ec10f23c1ccd2cb759a0ffc7646bb + REF v3.0.0 + SHA512 26da9b559b7220f44bc1aabd68250a4cf869329a5496ac439f9bc7cea5137e0ef9068dc6e868adf441cd5c212f21dd08f0a21db393eb4c237525961eefd49389 HEAD_REF master ) -- cgit v1.2.3