From 25808bac783cf3f5be38778eb57aec6af33be3fd Mon Sep 17 00:00:00 2001 From: xspeed1989 Date: Sat, 23 Mar 2019 12:12:57 +0800 Subject: [PATCH 1/3] load 0005-Fix-DLL-EXPORTS.patch --- ports/freetype/portfile.cmake | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 683c60eb65adb7..15eb6e692b0ea9 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_download_distfile(ARCHIVE FILENAME "freetype-${FT_VERSION}.tar.bz2" SHA512 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708 ) -vcpkg_extract_source_archive_ex( + +if(NOT ${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic") + vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${FT_VERSION} @@ -15,7 +17,20 @@ vcpkg_extract_source_archive_ex( 0002-Add-CONFIG_INSTALL_PATH-option.patch 0003-Fix-UWP.patch 0004-Fix-DLL-install.patch -) + ) +else() + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${FT_VERSION} + PATCHES + 0001-Fix-install-command.patch + 0002-Add-CONFIG_INSTALL_PATH-option.patch + 0003-Fix-UWP.patch + 0004-Fix-DLL-install.patch + 0005-Fix-DLL-EXPORTS.patch + ) +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} From 6ce8f205be43448f0628de1dbbf4458ef849df61 Mon Sep 17 00:00:00 2001 From: xspeed1989 Date: Sat, 23 Mar 2019 12:13:38 +0800 Subject: [PATCH 2/3] Create 0005-Fix-DLL-EXPORTS.patch --- ports/freetype/0005-Fix-DLL-EXPORTS.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 ports/freetype/0005-Fix-DLL-EXPORTS.patch diff --git a/ports/freetype/0005-Fix-DLL-EXPORTS.patch b/ports/freetype/0005-Fix-DLL-EXPORTS.patch new file mode 100644 index 00000000000000..96abaffb7c2b23 --- /dev/null +++ b/ports/freetype/0005-Fix-DLL-EXPORTS.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dd8a878..75f9ab7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,7 +141,7 @@ set(VERSION_PATCH "1") + # Increment REVISION. + set(LIBRARY_VERSION "6.16.0") + set(LIBRARY_SOVERSION "6") +- ++ADD_DEFINITIONS(-DDLL_EXPORT) + # These options mean "require x and complain if not found". They'll get + # optionally found anyway. Use `-DCMAKE_DISABLE_FIND_PACKAGE_x=TRUE` to disable + # searching for a packge entirely (x is the CMake package name, so "BZip2" From d864c6be712ea5f0421a29848848e3bdb86f4f05 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Thu, 28 Mar 2019 11:14:55 -0700 Subject: [PATCH 3/3] [freetype] cleanup whitespace --- ports/freetype/portfile.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 15eb6e692b0ea9..73cb6b31723f0c 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE ) if(NOT ${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic") - vcpkg_extract_source_archive_ex( + vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${FT_VERSION} @@ -17,9 +17,9 @@ if(NOT ${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic") 0002-Add-CONFIG_INSTALL_PATH-option.patch 0003-Fix-UWP.patch 0004-Fix-DLL-install.patch - ) + ) else() - vcpkg_extract_source_archive_ex( + vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${FT_VERSION} @@ -28,8 +28,8 @@ else() 0002-Add-CONFIG_INSTALL_PATH-option.patch 0003-Fix-UWP.patch 0004-Fix-DLL-install.patch - 0005-Fix-DLL-EXPORTS.patch - ) + 0005-Fix-DLL-EXPORTS.patch + ) endif() vcpkg_configure_cmake(