mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 01:19:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[wxWidgets] Fix issue introduced in 9b654a1f21 (#22509)

Browse Source 
Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
This commit is contained in:
Vitalii Koshura 2022-01-15 01:01:13 +01:00 committed by GitHub
parent e1e6a004f2
commit 371be89c1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ports/wxwidgets/portfile.cmake
View File

@ -102,13 +102,15 @@ if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/wx/setup.h)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
vcpkg_replace_string("${WX_SETUP_H_FILES_REL}" "${CURRENT_PACKAGES_DIR}" "")
vcpkg_replace_string("${WX_SETUP_H_FILES_REL}" "${CURRENT_PACKAGES_DIR}/lib/" "")
vcpkg_replace_string("${WX_SETUP_H_FILES_REL}" "/setup.h" "")
string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/" "" WX_SETUP_H_FILES_REL "${WX_SETUP_H_FILES_REL}")
string(REPLACE "/setup.h" "" WX_SETUP_H_REL_RELATIVE "${WX_SETUP_H_FILES_REL}")
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
vcpkg_replace_string("${WX_SETUP_H_FILES_DBG}" "${CURRENT_PACKAGES_DIR}" "")
vcpkg_replace_string("${WX_SETUP_H_FILES_DBG}" "${CURRENT_PACKAGES_DIR}/debug/lib/" "")
vcpkg_replace_string("${WX_SETUP_H_FILES_DBG}" "/setup.h" "")
string(REPLACE "${CURRENT_PACKAGES_DIR}/debug/lib/" "" WX_SETUP_H_FILES_DBG "${WX_SETUP_H_FILES_DBG}")
string(REPLACE "/setup.h" "" WX_SETUP_H_DBG_RELATIVE "${WX_SETUP_H_FILES_DBG}")
endif()
configure_file(${CMAKE_CURRENT_LIST_DIR}/setup.h.in ${CURRENT_PACKAGES_DIR}/include/wx/setup.h @ONLY)

2
ports/wxwidgets/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "wxwidgets",
"version-semver": "3.1.5",
"port-version": 6,
"port-version": 7,
"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.",

2
versions/baseline.json
View File

@ -7342,7 +7342,7 @@
},
"wxwidgets": {
"baseline": "3.1.5",
"port-version": 6
"port-version": 7
},
"x-plane": {
"baseline": "3.0.3",

5
versions/w-/wxwidgets.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9184caa631070403a5fd8c177b56907a313ad197",
"version-semver": "3.1.5",
"port-version": 7
},
{
"git-tree": "79ef97e2255a360a5515d0fbdbb839c15bb12548",
"version-semver": "3.1.5",