From f54e96af6fec5b9085b7b649d7d78811cd352693 Mon Sep 17 00:00:00 2001
From: JackBoosY <47264268+JackBoosY@users.noreply.github.com>
Date: Fri, 10 May 2019 03:00:58 +0800
Subject: [graphqlparser]Fix static build error (#6359)

---
 ports/graphqlparser/CONTROL                  |  2 +-
 ports/graphqlparser/portfile.cmake           |  4 +++-
 ports/graphqlparser/static-compile-fix.patch | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 ports/graphqlparser/static-compile-fix.patch

(limited to 'ports/graphqlparser')

diff --git a/ports/graphqlparser/CONTROL b/ports/graphqlparser/CONTROL
index 0f6ed481e..128c49498 100644
--- a/ports/graphqlparser/CONTROL
+++ b/ports/graphqlparser/CONTROL
@@ -1,3 +1,3 @@
 Source: graphqlparser
-Version: 0.7.0
+Version: 0.7.0-1
 Description: A GraphQL query parser in C++ with C and C++ APIs
diff --git a/ports/graphqlparser/portfile.cmake b/ports/graphqlparser/portfile.cmake
index 6e175fe6b..bab77a0c7 100644
--- a/ports/graphqlparser/portfile.cmake
+++ b/ports/graphqlparser/portfile.cmake
@@ -6,7 +6,9 @@ vcpkg_from_github(
     REF v0.7.0
     SHA512 973292b164d0d2cfe453a2f01559dbdb1b9d22b6304f6a3aabf71e2c0a3e24ab69dfd72a086764ad5befecf0005620f8e86f552dacc324f9615a05f31de7cede
     HEAD_REF master
-    PATCHES win-cmake.patch
+    PATCHES
+        win-cmake.patch
+        static-compile-fix.patch
 )
 
 if(UNIX)
diff --git a/ports/graphqlparser/static-compile-fix.patch b/ports/graphqlparser/static-compile-fix.patch
new file mode 100644
index 000000000..3f2756d71
--- /dev/null
+++ b/ports/graphqlparser/static-compile-fix.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 56741c2..313308a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,8 +142,11 @@ if (UNIX)
+ elseif(WIN32)
+   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphqlparser.lib
+ 	DESTINATION lib)
++  # do not install pdb when static compilation.
++  if (BUILD_SHARED_LIBS)
+   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphqlparser.pdb
+ 	DESTINATION bin)
++  endif()
+ endif()
+ 
+ IF (test)
-- 
cgit v1.2.3


From 5898891125b00a3ec2b698bc496735ab997669f5 Mon Sep 17 00:00:00 2001
From: Stefano Sinigardi <stesinigardi@hotmail.com>
Date: Sat, 1 Jun 2019 00:48:17 +0200
Subject: [openexr,openimageio,suitesparse,theia] updates for non-win32 (#6371)

* [openexr,openimageio,suitesparse,theia] updates for non-win32

* [theia] use only valid cmake symbols

* [suitesparse] Fix build

* [lapack] still not properly integrating with other ports

* [lapack] intercept cmake module calls and substitute them with our defs

* [suitesparse,clapack] fixes for proper integration

* [ceres,clapack] bump CONTROL

* [suitesparse] remove unnecessary defs

* [clapack] improve wrapper logic

* [WIN32] remove wrong symbol

* [clapack] fix wrapper integration

* [Accelerate] use best framework when available

* [clapack] separate config from wrapper

* [clapack] fix paths and filenames

* [mlpack,armadillo,clapack] improve library handling

* [mlpack] remove unnecessary cmake option

* [clp,coinutils,osi,liblemon] dependencies of openmvg, improve compatibility with non-win32

* [openmvg] fix for case-sensitive filesystems

* [clp,coinutils,osi] simplify CMakeLists removing many unnecessary steps

* [sophus] Force rebuild

* [theia] fixes for linux, part1

* [io2d] remove broken sintax

* [fontconfig] bump version to remove CI cached failure

* [theia] fixes for linux, part2

* [theia] remove unnecessary empty folders and comments from portfile

* [theia] use correct build type removing forced vars in cmakelists.txt

* [openmvg] add missing suitesparse target detection

* [sophus] fix Suitesparse dependency

* [sophus,openmvg] use suitesparse lowercase for module compatibility on case-sensitive filesystems

* [suitesparse] fixes for case-sensitive filesystems

* [openmvg] use correct Eigen3 name for case-sensitive filesystems

* [sophus] trigger rebuild

* [shogun] use modern vcpkg style

* [shogun] add missing cmake system processor symbol
---
 ports/graphqlparser/portfile.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ports/graphqlparser')

diff --git a/ports/graphqlparser/portfile.cmake b/ports/graphqlparser/portfile.cmake
index bab77a0c7..a90959f5d 100644
--- a/ports/graphqlparser/portfile.cmake
+++ b/ports/graphqlparser/portfile.cmake
@@ -11,12 +11,12 @@ vcpkg_from_github(
         static-compile-fix.patch
 )
 
-if(UNIX)
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     vcpkg_configure_cmake(
         SOURCE_PATH ${SOURCE_PATH}
         PREFER_NINJA
     )
-elseif(WIN32)
+elseif(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     vcpkg_find_acquire_program(PYTHON2)
     vcpkg_find_acquire_program(FLEX) #
     vcpkg_find_acquire_program(BISON)
-- 
cgit v1.2.3