[wxwidgets] Validate and fix#24047
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!
All manifest files must be formatted
./vcpkg format-manifest ports/*/vcpkg.json
Diff
diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json
index 435348b..089e02e 100644
--- a/ports/wxwidgets/vcpkg.json
+++ b/ports/wxwidgets/vcpkg.json
@@ -25,7 +25,7 @@
"zlib"
],
"features": {
- "example" : {
+ "example": {
"description": "Example source code and CMake project"
}
}After committing all other changes, the version database must be updated
git add -u && git commit
git checkout d72783cb3aeddfd667861caef1060e54ca6fa7a9 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index 4dc8f8d..f7f406b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7498,7 +7498,7 @@
},
"wxwidgets": {
"baseline": "3.1.5",
- "port-version": 8
+ "port-version": 9
},
"x-plane": {
"baseline": "3.0.3",
diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json
index ec84429..22f10f4 100644
--- a/versions/w-/wxwidgets.json
+++ b/versions/w-/wxwidgets.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "a8eb52c74cddc858d6a59187bedb666456e83cf9",
+ "version-semver": "3.1.5",
+ "port-version": 9
+ },
{
"git-tree": "dba058c37782edf771e7a62ae1bef98274c86b9f",
"version-semver": "3.1.5",You have modified or added at least one vcpkg.json where a "license" field is missing.
Details
If you feel able to do so, please consider adding a "license" field to the following files:
scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json
Valid values for the license field can be found in the documentation
|
Follow this fix. Thank you. |
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 bd1ef2df46303989eeb048eb7aa9b816aa46365e -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index c7016f8..6b904ab 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7502,7 +7502,7 @@
},
"wxwidgets": {
"baseline": "3.1.5",
- "port-version": 8
+ "port-version": 9
},
"x-plane": {
"baseline": "3.0.3",
diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json
index ec84429..8cca2d4 100644
--- a/versions/w-/wxwidgets.json
+++ b/versions/w-/wxwidgets.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "b3f82f8e52d357a2fd6346a06fa49765a0784bb6",
+ "version-semver": "3.1.5",
+ "port-version": 9
+ },
{
"git-tree": "dba058c37782edf771e7a62ae1bef98274c86b9f",
"version-semver": "3.1.5",You have modified or added at least one vcpkg.json where a "license" field is missing.
Details
If you feel able to do so, please consider adding a "license" field to the following files:
scripts/test_ports/cmake-user/vcpkg.jsonscripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json
Valid values for the license field can be found in the documentation
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 bd1ef2df46303989eeb048eb7aa9b816aa46365e -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index c7016f8..6b904ab 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7502,7 +7502,7 @@
},
"wxwidgets": {
"baseline": "3.1.5",
- "port-version": 8
+ "port-version": 9
},
"x-plane": {
"baseline": "3.0.3",
diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json
index ec84429..ea5554f 100644
--- a/versions/w-/wxwidgets.json
+++ b/versions/w-/wxwidgets.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "9b75b56e40db43bb78a31348bc14580fb4f19784",
+ "version-semver": "3.1.5",
+ "port-version": 9
+ },
{
"git-tree": "dba058c37782edf771e7a62ae1bef98274c86b9f",
"version-semver": "3.1.5",You have modified or added at least one vcpkg.json where a "license" field is missing.
Details
If you feel able to do so, please consider adding a "license" field to the following files:
scripts/test_ports/cmake-user/vcpkg.jsonscripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json
Valid values for the license field can be found in the documentation
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 bd1ef2df46303989eeb048eb7aa9b816aa46365e -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index c7016f8..6b904ab 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7502,7 +7502,7 @@
},
"wxwidgets": {
"baseline": "3.1.5",
- "port-version": 8
+ "port-version": 9
},
"x-plane": {
"baseline": "3.0.3",
diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json
index ec84429..f2f1495 100644
--- a/versions/w-/wxwidgets.json
+++ b/versions/w-/wxwidgets.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "b8aa5c1b09f21f3336f6c10dfc7ebef626dcd4f8",
+ "version-semver": "3.1.5",
+ "port-version": 9
+ },
{
"git-tree": "dba058c37782edf771e7a62ae1bef98274c86b9f",
"version-semver": "3.1.5",You have modified or added at least one vcpkg.json where a "license" field is missing.
Details
If you feel able to do so, please consider adding a "license" field to the following files:
scripts/test_ports/cmake-user/vcpkg.jsonscripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json
Valid values for the license field can be found in the documentation
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 bd1ef2df46303989eeb048eb7aa9b816aa46365e -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index c7016f8..6b904ab 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7502,7 +7502,7 @@
},
"wxwidgets": {
"baseline": "3.1.5",
- "port-version": 8
+ "port-version": 9
},
"x-plane": {
"baseline": "3.0.3",
diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json
index ec84429..c78d7a6 100644
--- a/versions/w-/wxwidgets.json
+++ b/versions/w-/wxwidgets.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "97db7c1b0d34158952ecdc6db6ce6a0aae282256",
+ "version-semver": "3.1.5",
+ "port-version": 9
+ },
{
"git-tree": "dba058c37782edf771e7a62ae1bef98274c86b9f",
"version-semver": "3.1.5",You have modified or added at least one vcpkg.json where a "license" field is missing.
Details
If you feel able to do so, please consider adding a "license" field to the following files:
scripts/test_ports/cmake-user/vcpkg.jsonscripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json
Valid values for the license field can be found in the documentation
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 bd1ef2df46303989eeb048eb7aa9b816aa46365e -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index c7016f8..6b904ab 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7502,7 +7502,7 @@
},
"wxwidgets": {
"baseline": "3.1.5",
- "port-version": 8
+ "port-version": 9
},
"x-plane": {
"baseline": "3.0.3",
diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json
index ec84429..2519621 100644
--- a/versions/w-/wxwidgets.json
+++ b/versions/w-/wxwidgets.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "faa68115d2c002efc172b9082a75ba93b80ce00a",
+ "version-semver": "3.1.5",
+ "port-version": 9
+ },
{
"git-tree": "dba058c37782edf771e7a62ae1bef98274c86b9f",
"version-semver": "3.1.5",You have modified or added at least one vcpkg.json where a "license" field is missing.
Details
If you feel able to do so, please consider adding a "license" field to the following files:
scripts/test_ports/cmake-user/vcpkg.jsonscripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json
Valid values for the license field can be found in the documentation
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 bd1ef2df46303989eeb048eb7aa9b816aa46365e -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index c7016f8..6b904ab 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7502,7 +7502,7 @@
},
"wxwidgets": {
"baseline": "3.1.5",
- "port-version": 8
+ "port-version": 9
},
"x-plane": {
"baseline": "3.0.3",
diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json
index ec84429..797d132 100644
--- a/versions/w-/wxwidgets.json
+++ b/versions/w-/wxwidgets.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "ed6660583c3bd29abfd0421bf6f9d9a42069f1f4",
+ "version-semver": "3.1.5",
+ "port-version": 9
+ },
{
"git-tree": "dba058c37782edf771e7a62ae1bef98274c86b9f",
"version-semver": "3.1.5",You have modified or added at least one vcpkg.json where a "license" field is missing.
Details
If you feel able to do so, please consider adding a "license" field to the following files:
scripts/test_ports/cmake-user/vcpkg.jsonscripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json
Valid values for the license field can be found in the documentation
|
In the current state of the PR (9adb008), the port behaves much better:
There are still some shortcomings:
All open issues for wxwidgets: |
There was a problem hiding this comment.
We might make it an error if there is something else than NOT, CONFIG:DEBUG, LINK_ONLY, to catch future changes.
|
Should I test it too? Is ready for test? |
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 f6af75acc923c833a5620943e3fc7d5e4930f0df -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index 630a0f7..0ca1fdc 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7502,7 +7502,7 @@
},
"wxwidgets": {
"baseline": "3.1.5",
- "port-version": 8
+ "port-version": 10
},
"x-plane": {
"baseline": "3.0.3",
diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json
index ec84429..8a0b7ce 100644
--- a/versions/w-/wxwidgets.json
+++ b/versions/w-/wxwidgets.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "78544fc3c99af9bc945de55497e778692a8ccaf5",
+ "version-semver": "3.1.5",
+ "port-version": 10
+ },
{
"git-tree": "dba058c37782edf771e7a62ae1bef98274c86b9f",
"version-semver": "3.1.5",You have modified or added at least one vcpkg.json where a "license" field is missing.
Details
If you feel able to do so, please consider adding a "license" field to the following files:
scripts/test_ports/cmake-user/vcpkg.jsonscripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json
Valid values for the license field can be found in the documentation
Split original patch. Restore missing appending in the end. Drop libs (generator expression) which don't match build type.
|
One question about examples: Is this intended? |
Not by default but in CI. |
strega-nil-ms
left a comment
There was a problem hiding this comment.
LGTM apart from that
| @@ -0,0 +1,21 @@ | |||
| cmake_minimum_required(VERSION 3.7) | |||
There was a problem hiding this comment.
I don't love this being named top level CMakeLists.txt; I'd prefer it to be in an example folder.
Also, I need to test this with the windows.cmake CMAKE_CROSSCOMPILING change, since I noticed find_package(wxWidgets) is broken by CMAKE_CROSSCOMPILING
There was a problem hiding this comment.
I don't love this being named top level
CMakeLists.txt; I'd prefer it to be in an example folder.
Okay.
Also, I need to test this with the windows.cmake
CMAKE_CROSSCOMPILINGchange, since I noticedfind_package(wxWidgets)is broken byCMAKE_CROSSCOMPILING
Which change do you refer to? Which breakage?
AFAICS the CMake find module doesn't support win32 mode with CMAKE_CROSSCOMPILING:
https://github.com/Kitware/CMake/blob/6453bd046ef23798c64333042d76851f15eff2fc/Modules/FindwxWidgets.cmake#L221-L225
(Mingw was added only 5 days ago. For MSVC, apart from fixing upstream, we could try to hack it the opposite way I did for mingw.)
There was a problem hiding this comment.
mmh, it looks like this is a vcpkg thing; CMAKE_CROSSCOMPILING is never set on Windows targeting Windows. (it's not set right now either, but we're going to be setting it in windows.cmake in the future)
| if(MINGW AND NOT CMAKE_CROSSCOMPILING) | ||
| # Force FindwxWidgets.cmake unix mode, matching mingw install layout | ||
| set(_vcpkg_wxwidgets_fake_crosscompiling 1) | ||
| set(CMAKE_CROSSCOMPILING 1) | ||
| endif() |
There was a problem hiding this comment.
| if(MINGW AND NOT CMAKE_CROSSCOMPILING) | |
| # Force FindwxWidgets.cmake unix mode, matching mingw install layout | |
| set(_vcpkg_wxwidgets_fake_crosscompiling 1) | |
| set(CMAKE_CROSSCOMPILING 1) | |
| endif() | |
| if(MINGW AND NOT CMAKE_CROSSCOMPILING) | |
| # Force FindwxWidgets.cmake unix mode, matching mingw install layout | |
| set(_vcpkg_wxwidgets_backup_crosscompiling "${CMAKE_CROSSCOMPILING}") | |
| set(CMAKE_CROSSCOMPILING 1) | |
| endif() | |
| if(WIN32 AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") | |
| set(_vcpkg_wxwidgets_backup_crosscompiling "${CMAKE_CROSSCOMPILING}") | |
| set(CMAKE_CROSSCOMPILING 0) | |
| endif() |
There was a problem hiding this comment.
@strega-nil-ms I applied this with modifications.
| if(MINGW) | ||
| if(_vcpkg_wxwidgets_fake_crosscompiling) | ||
| unset(CMAKE_CROSSCOMPILING) | ||
| unset(_vcpkg_wxwidgets_fake_crosscompiling) | ||
| endif() | ||
| elseif(WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") |
There was a problem hiding this comment.
| if(MINGW) | |
| if(_vcpkg_wxwidgets_fake_crosscompiling) | |
| unset(CMAKE_CROSSCOMPILING) | |
| unset(_vcpkg_wxwidgets_fake_crosscompiling) | |
| endif() | |
| elseif(WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") | |
| if(DEFINED _vcpkg_wxwidgets_backup_crosscompiling) | |
| set(CMAKE_CROSSCOMPILING "${_vcpkg_wxwidgets_backup_crosscompiling}") | |
| unset(_vcpkg_wxwidgets_backup_crosscompiling) | |
| endif() | |
| if(WIN32 AND NOT MINGW AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") |
There was a problem hiding this comment.
You have modified or added at least one vcpkg.json where a "license" field is missing.
Details
If you feel able to do so, please consider adding a "license" field to the following files:
scripts/test_ports/cmake-user/vcpkg.jsonscripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json
Valid values for the license field can be found in the documentation
There was a problem hiding this comment.
You have modified or added at least one vcpkg.json where a "license" field is missing.
Details
If you feel able to do so, please consider adding a "license" field to the following files:
scripts/test_ports/cmake-user/vcpkg.jsonscripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json
Valid values for the license field can be found in the documentation
talregev
left a comment
There was a problem hiding this comment.
Working on the ci and wsl2.
|
Thanks! |
|
The lib now contains absolute paths: ldlibs_base="/Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg_installed/arm64-osx/lib/libz.a -lwxregexu-3.1 /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk/usr/lib/libiconv.tbd -framework CoreFoundation -framework Security -framework Carbon -framework Cocoa -framework IOKit -framework QuartzCore"
ldlibs_core="-lwx_baseu-3.1 /Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg_installed/arm64-osx/lib/libjpeg.a /Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg_installed/arm64-osx/lib/libpng.a /Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg_installed/arm64-osx/lib/libz.a /Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg_installed/arm64-osx/lib/libtiff.a /Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg_installed/arm64-osx/lib/liblzma.a /Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg_installed/arm64-osx/lib/libjpeg.a /Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg_installed/arm64-osx/lib/libz.a -lm -framework AudioToolbox -framework WebKit "
ldlibs_xml="-lwx_baseu-3.1 /Users/leanderSchulten/git_projekte/Lichtsteuerung/vcpkg_installed/arm64-osx/lib/libexpat.a" |
|
I can take a look tonight. |
What does your PR fix?
(For windows, I had to rely on build logs including CMake
--trace-expandinvpckg-ci-wxwidgets. Manual review welcome.)FindwxWidgets.cmakeinto unix mode via wrapper.)Out of scope for this PR:
wxrcprobably won't work properly in cross builds.wxUSE_XRC.To be done in separate PR.
Which triplets are supported/not supported? Have you updated the CI baseline?
all, no (no CI testing for x64-linux due to GTK 3 dependency)
Does your PR follow the maintainer guide?
yes
If you have added/updated a port: Have you run
./vcpkg x-add-version --alland committed the result?yes