mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 12:06:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[freetype] fix issue #5774 (#5853)

Browse Source 
* load 0005-Fix-DLL-EXPORTS.patch

* Create 0005-Fix-DLL-EXPORTS.patch

* [freetype] cleanup whitespace
This commit is contained in:
Phil Christensen 2019-03-28 16:27:35 -07:00 committed by GitHub
parent 2601164fa9
commit 4ce30f90ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/freetype/0005-Fix-DLL-EXPORTS.patch Normal file
View File

@ -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
ports/freetype/portfile.cmake
View File

@ -6,7 +6,9 @@ vcpkg_download_distfile(ARCHIVE
FILENAME "freetype-${FT_VERSION}.tar.bz2" FILENAME "freetype-${FT_VERSION}.tar.bz2"
SHA512 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708 SHA512 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708
) )
vcpkg_extract_source_archive_ex(
if(NOT ${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic")
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE} ARCHIVE ${ARCHIVE}
REF ${FT_VERSION} REF ${FT_VERSION}
@ -15,7 +17,20 @@ vcpkg_extract_source_archive_ex(
0002-Add-CONFIG_INSTALL_PATH-option.patch 0002-Add-CONFIG_INSTALL_PATH-option.patch
0003-Fix-UWP.patch 0003-Fix-UWP.patch
0004-Fix-DLL-install.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( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}