The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[freetype]Re-fixed the issue of exporting symbols when building dynamic library. (#7141)

Browse Source
This commit is contained in:
JackBoosY 2019-07-08 14:21:37 +08:00 committed by Phil Christensen
parent 3fe88fd988
commit 327494e9ac
3 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ports/freetype/0005-Fix-DLL-EXPORTS.patch
View File

@ -1,13 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd8a878..75f9ab7 100644 index ede5daf..46c1e55 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -141,7 +141,7 @@ set(VERSION_PATCH "1") @@ -151,6 +151,9 @@ set(LIBRARY_SOVERSION "6")
# 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 # 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" # searching for a packge entirely (x is the CMake package name, so "BZip2"
# instead of "BZIP2").
+if (ENABLE_DLL_EXPORT)
+ ADD_DEFINITIONS(-DDLL_EXPORT)
+endif()
option(FT_WITH_ZLIB "Use system zlib instead of internal library." OFF)
option(FT_WITH_BZIP2 "Support bzip2 compressed fonts." OFF)
option(FT_WITH_PNG "Support PNG compressed OpenType embedded bitmaps." OFF)

2
ports/freetype/CONTROL
View File

@ -1,5 +1,5 @@
Source: freetype Source: freetype
Version: 2.10.0 Version: 2.10.0-1
Build-Depends: zlib, bzip2, libpng Build-Depends: zlib, bzip2, libpng
Homepage: https://www.freetype.org/ Homepage: https://www.freetype.org/
Description: A library to render fonts. Description: A library to render fonts.

33
ports/freetype/portfile.cmake
View File

@ -7,27 +7,21 @@ vcpkg_download_distfile(ARCHIVE
SHA512 dfad66f419ea9577f09932e0730c0c887bdcbdbc8152fa7477a0c39d69a5b68476761deed6864ddcc5cf18d100a7a3f728049768e24afcb04b1a74b25b6acf7e SHA512 dfad66f419ea9577f09932e0730c0c887bdcbdbc8152fa7477a0c39d69a5b68476761deed6864ddcc5cf18d100a7a3f728049768e24afcb04b1a74b25b6acf7e
) )
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
0005-Fix-DLL-EXPORTS.patch
)
if(NOT ${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic") if(NOT ${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic")
vcpkg_extract_source_archive_ex( set(ENABLE_DLL_EXPORT OFF)
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
)
else() else()
vcpkg_extract_source_archive_ex( set(ENABLE_DLL_EXPORT ON)
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
0005-Fix-DLL-EXPORTS.patch
)
endif() endif()
vcpkg_configure_cmake( vcpkg_configure_cmake(
@ -40,6 +34,7 @@ vcpkg_configure_cmake(
-DFT_WITH_PNG=ON -DFT_WITH_PNG=ON
-DFT_WITH_HARFBUZZ=OFF -DFT_WITH_HARFBUZZ=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
-DENABLE_DLL_EXPORT=${ENABLE_DLL_EXPORT}
) )
vcpkg_install_cmake() vcpkg_install_cmake()