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

[wxwidgets] Add feature wxdebug-level #25551

Closed
wants to merge 2 commits into from
Closed

[wxwidgets] Add feature wxdebug-level #25551

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6107f8
Add feature wxdebug-level
Mengna-Li Jul 4, 2022
b01799c
update feature name
Mengna-Li Jul 5, 2022
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
10 changes: 8 additions & 2 deletions ports/wxcharts/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,16 @@ vcpkg_from_github(
SHA512 4c52e4ad6d3c4ba496aad7e654ee75ddd9009aadc44be37fc64f3e3ac56001a7e9728f7fdd0c78f8261bff0bf8a6748f8a7649cb160ca37c2d686530c161c2f6
)

if("wxdebug-level" IN_LIST FEATURES)
list(APPEND FEATURE_OPTIONS -DwxBUILD_DEBUG_LEVEL=0)
else()
list(APPEND FEATURE_OPTIONS -DwxBUILD_DEBUG_LEVEL=1)
endif()

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS_RELEASE
-DwxBUILD_DEBUG_LEVEL=0
OPTIONS
${FEATURE_OPTIONS}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume, this still should be an OPTIONS_RELEASE because in general it's nice to have wxBUILD_DEBUG_LEVEL=1 when building in Debug mode

Comment on lines +16 to +17
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
OPTIONS
${FEATURE_OPTIONS}
OPTIONS_RELEASE
-DwxBUILD_DEBUG_LEVEL=0
OPTIONS_DEBUG
-DwxBUILD_DEBUG_LEVEL=1

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm afraid, this will not solve the original issue described here: #25437

)

vcpkg_cmake_install()
Expand Down
8 changes: 7 additions & 1 deletion ports/wxcharts/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "wxcharts",
"version-date": "2022-06-16",
"port-version": 1,
"description": "Chart controls for the wxWidgets cross-platform GUI library",
"homepage": "https://www.wxishiko.com/wxCharts",
"license": "MIT",
Expand All @@ -14,5 +15,10 @@
"host": true
},
"wxwidgets"
]
],
"features": {
"wxdebug-level": {
"description": "Enable assert checks"
}
}
}
8 changes: 6 additions & 2 deletions ports/wxwidgets/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ vcpkg_check_features(
sound wxUSE_SOUND
)

if("wxdebug-level" IN_LIST FEATURES)
list(APPEND FEATURE_OPTIONS -DwxBUILD_DEBUG_LEVEL=0)
else()
list(APPEND FEATURE_OPTIONS -DwxBUILD_DEBUG_LEVEL=1)
endif()
Adela0814 marked this conversation as resolved.
Show resolved Hide resolved

vcpkg_find_acquire_program(PKGCONFIG)

set(OPTIONS "")
Expand Down Expand Up @@ -98,8 +104,6 @@ vcpkg_cmake_configure(
# The minimum cmake version requirement for Cotire is 2.8.12.
# however, we need to declare that the minimum cmake version requirement is at least 3.1 to use CMAKE_PREFIX_PATH as the path to find .pc.
-DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON
OPTIONS_RELEASE
-DwxBUILD_DEBUG_LEVEL=0
)

vcpkg_cmake_install()
Expand Down
5 changes: 4 additions & 1 deletion ports/wxwidgets/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "wxwidgets",
"version": "3.1.6",
"port-version": 2,
"port-version": 3,
"description": [
"Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ",
"Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.",
Expand Down Expand Up @@ -48,6 +48,9 @@
"platform": "!windows & !osx"
}
]
},
"wxdebug-level": {
"description": "Enable assert checks"
Adela0814 marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
8 changes: 6 additions & 2 deletions scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS
wxrc USE_WXRC
)

if("wxdebug-level" IN_LIST FEATURES)
list(APPEND OPTIONS -DwxBUILD_DEBUG_LEVEL=0)
else()
list(APPEND OPTIONS -DwxBUILD_DEBUG_LEVEL=1)
endif()

vcpkg_cmake_configure(
SOURCE_PATH "${CURRENT_INSTALLED_DIR}/share/wxwidgets/example"
DISABLE_PARALLEL_CONFIGURE # Need separate dbg log for following test
OPTIONS
${OPTIONS}
-DCMAKE_CONFIG_RUN=1
"-DPRINT_VARS=CMAKE_CONFIG_RUN;wxWidgets_LIBRARIES"
OPTIONS_RELEASE
-DwxBUILD_DEBUG_LEVEL=0
)
vcpkg_cmake_build()

Expand Down
3 changes: 3 additions & 0 deletions scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
},
"wxrc": {
"description": "Test wxrc"
},
"wxdebug_level": {
"description": "Enable assert checks"
}
}
}
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7630,11 +7630,11 @@
},
"wxcharts": {
"baseline": "2022-06-16",
"port-version": 0
"port-version": 1
},
"wxwidgets": {
"baseline": "3.1.6",
"port-version": 2
"port-version": 3
},
"x-plane": {
"baseline": "3.0.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/w-/wxcharts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4686b3bb10d91483e279295163a2acf933ec3e1c",
"version-date": "2022-06-16",
"port-version": 1
},
{
"git-tree": "0d4c30893a28468249d63c0f4c1a1a9e231ac817",
"version-date": "2022-06-16",
Expand Down
5 changes: 5 additions & 0 deletions versions/w-/wxwidgets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "458dcf51efd24e81845db35151bcc8cffae960a4",
"version": "3.1.6",
"port-version": 3
},
{
"git-tree": "27a68f45cbdc9ab88864c353c7a8b91f76153509",
"version": "3.1.6",
Expand Down