aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-03-23 10:47:26 -0700
committerRobert Schumacher <roschuma@microsoft.com>2018-03-23 10:47:26 -0700
commit55e385952df99bed38c5a053999e73aa1113d92a (patch)
tree136b82c6140e84a28ce894e3b5d7f7e8df9f1348
parentca154ffb79b03413f38cac3d24707e0d17262ff5 (diff)
downloadvcpkg-55e385952df99bed38c5a053999e73aa1113d92a.tar.gz
vcpkg-55e385952df99bed38c5a053999e73aa1113d92a.zip
[graphite2] Patch out test executable. Fixes #3102.
-rw-r--r--ports/graphite2/disable-tests-docs.patch19
-rw-r--r--ports/graphite2/portfile.cmake12
2 files changed, 29 insertions, 2 deletions
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/portfile.cmake b/ports/graphite2/portfile.cmake
index 000817449..eb017e9d8 100644
--- a/ports/graphite2/portfile.cmake
+++ b/ports/graphite2/portfile.cmake
@@ -9,16 +9,24 @@ vcpkg_from_github(
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()
-# file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/gr2fonttest.exe)
-# file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/gr2fonttest.exe)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/graphite2)
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)