Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[freetype] fix issue #5774 #5853

Merged
merged 3 commits into from
Mar 28, 2019
Merged

[freetype] fix issue #5774 #5853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25808ba
load 0005-Fix-DLL-EXPORTS.patch
xspeed1989 Mar 23, 2019
6ce8f20
Create 0005-Fix-DLL-EXPORTS.patch
xspeed1989 Mar 23, 2019
d864c6b
[freetype] cleanup whitespace
Rastaban Mar 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/freetype/0005-Fix-DLL-EXPORTS.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
19 changes: 17 additions & 2 deletions ports/freetype/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
Expand Down