Merge pull request #1 from Microsoft/master

Update vcpkg from upstream

4 files changed, 78 insertions, 0 deletions

diff --git a/ports/graphite2/CONTROL b/ports/graphite2/CONTROL
new file mode 100644
index 000000000..eb12bb450
--- /dev/null
+++ b/ports/graphite2/CONTROL
@@ -0,0 +1,4 @@
+Source: graphite2
+Version: 1.3.10
+Description: Graphite is a "smart font" system developed specifically to handle the complexities of lesser-known languages of the world.
+  Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications.
\ No newline at end of file
diff --git a/ports/graphite2/disable-tests-docs.patch b/ports/graphite2/disable-tests-docs.patch
new file mode 100644
index 000000000..ff92caa16
--- /dev/null
+++ b/ports/graphite2/disable-tests-docs.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 3466c5f..6d5c6bd 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -63,9 +63,13 @@ endif (GRAPHITE2_VM_TYPE STREQUAL "direct" AND NOT (CMAKE_COMPILER_IS_GNUCXX OR

+ message(STATUS "Using vm machine type: ${GRAPHITE2_VM_TYPE}")

+ 

+ add_subdirectory(src)

++if(NOT DISABLE_TESTS)

+ add_subdirectory(tests)

++endif()

++if(NOT DISABLE_DOCS)

+ add_subdirectory(doc)

+-if (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))

++endif()

++if (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE) AND NOT DISABLE_TESTS)

+     add_subdirectory(gr2fonttest)

+ endif (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))

+ 

diff --git a/ports/graphite2/fix-static-build.patch b/ports/graphite2/fix-static-build.patch
new file mode 100644
index 000000000..7a51f43cf
--- /dev/null
+++ b/ports/graphite2/fix-static-build.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3466c5f..d88b3bc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -63,11 +63,11 @@ endif (GRAPHITE2_VM_TYPE STREQUAL "direct" AND NOT (CMAKE_COMPILER_IS_GNUCXX OR
+ message(STATUS "Using vm machine type: ${GRAPHITE2_VM_TYPE}")
+ 
+ add_subdirectory(src)
+-add_subdirectory(tests)
+-add_subdirectory(doc)
+-if (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
+-    add_subdirectory(gr2fonttest)
+-endif (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
++# add_subdirectory(tests)
++# add_subdirectory(doc)
++# if (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
++#     add_subdirectory(gr2fonttest)
++# endif (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
+ 
+ set(version 3.0.1)
+ set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
diff --git a/ports/graphite2/portfile.cmake b/ports/graphite2/portfile.cmake
new file mode 100644
index 000000000..eb017e9d8
--- /dev/null
+++ b/ports/graphite2/portfile.cmake
@@ -0,0 +1,34 @@
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO silnrsi/graphite
+    REF 99658129785a218556929db0595a002a668b40b0
+    SHA512 50cf6f727a2ea13ccbf55b4dad282358c40973aa0a0d97db6d721208b70fe848791aab183062c7bed8ce5b0dc3fecd6b604f6defdd5ae89b46ce267069ee0ed1
+    HEAD_REF master
+)
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable-tests-docs.patch"
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DDISABLE_TESTS=ON
+        -DDISABLE_DOCS=ON
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/graphite2)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/graphite2)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/graphite2 RENAME copyright)