From 349d82eecac51f8349e0fb82a46fc16ef49fc79e Mon Sep 17 00:00:00 2001 From: Lennart Trunk Date: Tue, 12 Feb 2019 22:40:27 +0100 Subject: [PATCH] [freetype] fix DLL install on Windows (#5354) * [wip] fix DLL install on Windows * change patchfile encoding to UTF-8 --- ports/freetype/0004-Fix-DLL-install.patch | 13 +++++++++++++ ports/freetype/CONTROL | 2 +- ports/freetype/portfile.cmake | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/freetype/0004-Fix-DLL-install.patch diff --git a/ports/freetype/0004-Fix-DLL-install.patch b/ports/freetype/0004-Fix-DLL-install.patch new file mode 100644 index 0000000000..8d70b993f0 --- /dev/null +++ b/ports/freetype/0004-Fix-DLL-install.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fe9bc65..dd8a878 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -478,6 +478,8 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) + EXPORT freetype-targets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++# DLL is RUNTIME ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + FRAMEWORK DESTINATION Library/Frameworks + COMPONENT libraries) + install( diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL index 8afeb5f657..7e18d1a7ce 100644 --- a/ports/freetype/CONTROL +++ b/ports/freetype/CONTROL @@ -1,4 +1,4 @@ Source: freetype -Version: 2.9.1 +Version: 2.9.1-1 Build-Depends: zlib, bzip2, libpng Description: A library to render fonts. diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 96e285dec0..ace5a062dd 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_extract_source_archive_ex( 0001-Fix-install-command.patch 0002-Add-CONFIG_INSTALL_PATH-option.patch 0003-Fix-UWP.patch + 0004-Fix-DLL-install.patch ) vcpkg_configure_cmake(