From 25e8a482a8dcd93d4ec434d0895982a320689a0b Mon Sep 17 00:00:00 2001 From: LarryIII <33021067+LarryIII@users.noreply.github.com> Date: Fri, 1 Feb 2019 11:12:29 -0800 Subject: [json-spirit] Fix link error C1128 (#5263) * [json-spirit] Fix link error C1128 * Update patch file --- ports/json-spirit/CONTROL | 2 +- ports/json-spirit/Fix-link-error-C1128.patch | 15 +++++++++++++++ ports/json-spirit/portfile.cmake | 8 +++----- 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 ports/json-spirit/Fix-link-error-C1128.patch diff --git a/ports/json-spirit/CONTROL b/ports/json-spirit/CONTROL index dcfc407d7..e2b1d8079 100644 --- a/ports/json-spirit/CONTROL +++ b/ports/json-spirit/CONTROL @@ -1,4 +1,4 @@ Source: json-spirit -Version: 4.1.0 +Version: 4.1.0-1 Description: json parser using boost library Build-Depends: boost-config, boost-integer, boost-smart-ptr, boost-variant, boost-spirit diff --git a/ports/json-spirit/Fix-link-error-C1128.patch b/ports/json-spirit/Fix-link-error-C1128.patch new file mode 100644 index 000000000..e676931cc --- /dev/null +++ b/ports/json-spirit/Fix-link-error-C1128.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 24b1caf..2aac0b0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,7 +60,9 @@ endif() + + message(${CMAKE_INSTALL_INCLUDEDIR}) + +- ++if(MSVC) ++add_definitions(/bigobj) ++endif() + set(CPACK_PACKAGE_VERSION_MAJOR 4) + set(CPACK_PACKAGE_VERSION_MINOR 0) + set(CPACK_PACKAGE_VERSION_PATCH 8) diff --git a/ports/json-spirit/portfile.cmake b/ports/json-spirit/portfile.cmake index 05be540b3..3b5e1d316 100644 --- a/ports/json-spirit/portfile.cmake +++ b/ports/json-spirit/portfile.cmake @@ -6,11 +6,9 @@ vcpkg_from_github( REF 5e16cca59b31d8beda0f07e3917ce11dcd43b3db SHA512 6ac0f15726391c9003e516213535c8d30e98b6c33bca0b03e9bf38e7085824bfc6cfaab267b1dfccbfcc567638d26f722d7e331f4e3b60d3acd5c717cb1fafcc HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/dll-wins.patch + PATCHES + dll-wins.patch + Fix-link-error-C1128.patch ) vcpkg_configure_cmake( -- cgit v1.2.3