[freetype] Add cmake policy CMP0011 and CMP0012#19459
[freetype] Add cmake policy CMP0011 and CMP0012#19459JackBoosY wants to merge 7 commits intomicrosoft:masterfrom
Conversation
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 57bd7102d9fd880daa1b0958692294c4a125f6d8 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index 19650fa..434d4fe 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2142,7 +2142,7 @@
},
"freetype": {
"baseline": "2.10.4",
- "port-version": 0
+ "port-version": 1
},
"freetype-gl": {
"baseline": "2020-09-14",
diff --git a/versions/f-/freetype.json b/versions/f-/freetype.json
index 4462655..4877d26 100644
--- a/versions/f-/freetype.json
+++ b/versions/f-/freetype.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "a03c381a612922ba27cf170da915c53c41f9ad30",
+ "version-semver": "2.10.4",
+ "port-version": 1
+ },
{
"git-tree": "dabcba1d5153c796480c50c459ef045b5db8d2a4",
"version-string": "2.10.4",There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 57bd7102d9fd880daa1b0958692294c4a125f6d8 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/f-/freetype.json b/versions/f-/freetype.json
index 4877d26..c5da271 100644
--- a/versions/f-/freetype.json
+++ b/versions/f-/freetype.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "a03c381a612922ba27cf170da915c53c41f9ad30",
+ "git-tree": "42566110002caeba02e4dc508249bce0aa32a848",
"version-semver": "2.10.4",
"port-version": 1
},| @@ -1,65 +1,72 @@ | |||
| _find_package(${ARGS}) | |||
| if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3) | |||
There was a problem hiding this comment.
Wait what? This policy was introduced in CMake version 2.8.0
Why do you if that ? Also you probably only wanted to if the cmake_policy calls?
(furthermore it looks like a cmake_minimum_required call is missing in the calling project? )
CMAKE_VERSION VERSION_GREATER_EQUAL 3.3
I also don't get why you use this. I thought we all agreed indirectly to assume at least 3.5.1
There was a problem hiding this comment.
Sorry, I saw many examples on our cmake wrappers before. So only need to use the 3.5.1 condition to include the part of the policy code?
There was a problem hiding this comment.
@Neumann-A Does that met you requirement?
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 57bd7102d9fd880daa1b0958692294c4a125f6d8 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/f-/freetype.json b/versions/f-/freetype.json
index 4877d26..11ad021 100644
--- a/versions/f-/freetype.json
+++ b/versions/f-/freetype.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "a03c381a612922ba27cf170da915c53c41f9ad30",
+ "git-tree": "b50dfb329d424da0a2bab4e4c2bac95e54fd6096",
"version-semver": "2.10.4",
"port-version": 1
},
dg0yt
left a comment
There was a problem hiding this comment.
This whole PR is only needed to support projects which have a `cmake_minimum_required(VERSION ...) of less than 2.8.
…jack/fix-freetype-wrapper
|
gstreamer regressions are a baseline issue. |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
…#21641) * Verify library location for debug vs. release * Use existing variables for wrapper * Always install freetype wrapper * Quote @expressions * Set policies for freetype wrapper (#19459) * Test JPEG * Fix jpeg wrapper for CMake < 3.12 * Test TIFF * Test with current and oldest supported CMake * Test and fix icu cmake wrapper * CMake policy fixes [skip actions] * Update versions * CI * CI * Nicole CRs * Disable Curses test * Prefer <Pkg>_VAR over <PKG>_VAR Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Fix bug when using freetype:
And
Related: #17055