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

[freetype] Add cmake policy CMP0011 and CMP0012 #19459

Closed
wants to merge 7 commits into from
Closed

[freetype] Add cmake policy CMP0011 and CMP0012 #19459

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
46aeebf
[freetype] Add cmake policy CMP0011 and CMP0012
Aug 9, 2021
06626d7
version
Aug 9, 2021
bff10a2
improvement
Aug 9, 2021
bf8db4b
apply suggestion
Aug 16, 2021
c0e80fa
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Oct 13, 2021
05d2b31
Apply suggestions
Oct 13, 2021
4f6a2b6
version
Oct 13, 2021
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
21 changes: 0 additions & 21 deletions ports/freetype/CONTROL
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions ports/freetype/vcpkg-cmake-wrapper.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.5.1)
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
cmake_policy(PUSH)
cmake_policy(SET CMP0012 NEW)
endif()

_find_package(${ARGS})

if(@USE_ZLIB@)
Expand Down Expand Up @@ -63,3 +68,7 @@ if(FREETYPE_LIBRARIES)
list(APPEND FREETYPE_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES})
endif()
endif()

if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.5.1)
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
cmake_policy(POP)
endif()
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
39 changes: 39 additions & 0 deletions ports/freetype/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"name": "freetype",
"version-semver": "2.10.4",
"port-version": 1,
"description": "A library to render fonts.",
"homepage": "https://www.freetype.org/",
"default-features": [
"brotli",
"bzip2",
"png",
"zlib"
],
"features": {
"brotli": {
"description": "Support decompression of WOFF2 streams",
"dependencies": [
"brotli"
]
},
"bzip2": {
"description": "Support bzip2 compressed fonts.",
"dependencies": [
"bzip2"
]
},
"png": {
"description": "Support PNG compressed OpenType embedded bitmaps.",
"dependencies": [
"libpng"
]
},
"zlib": {
"description": "Use zlib instead of internal library for DEFLATE",
"dependencies": [
"zlib"
]
}
}
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2142,7 +2142,7 @@
},
"freetype": {
"baseline": "2.10.4",
"port-version": 0
"port-version": 1
},
"freetype-gl": {
"baseline": "2020-09-14",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/freetype.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a03c381a612922ba27cf170da915c53c41f9ad30",
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
"version-semver": "2.10.4",
"port-version": 1
},
{
"git-tree": "dabcba1d5153c796480c50c459ef045b5db8d2a4",
"version-string": "2.10.4",
Expand Down