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

[wxwidgets] Fix include path in UNIX (#16371)

Browse Source 
* [wxwidgets] Fix include path in UNIX

* update version record
This commit is contained in:
Jack·Boos·Yu 2021-04-08 05:12:18 +08:00 committed by GitHub
parent c90db9a65e
commit 7d596220f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports/wxwidgets/portfile.cmake
View File

@ -88,7 +88,16 @@ foreach(INC IN LISTS INCLUDES)
endforeach()
if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/wx/setup.h)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/setup.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/wx)
file(GLOB_RECURSE WX_SETUP_H_FILES_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/*.h)
file(GLOB_RECURSE WX_SETUP_H_FILES_REL ${CURRENT_PACKAGES_DIR}/lib/*.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}")
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}")
configure_file(${CMAKE_CURRENT_LIST_DIR}/setup.h.in ${CURRENT_PACKAGES_DIR}/include/wx/setup.h @ONLY)
endif()
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxwidgets)
configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/wxwidgets/usage COPYONLY)

5
ports/wxwidgets/setup.h
View File

@ -1,5 +0,0 @@
#ifdef _DEBUG
#include "../../debug/lib/mswud/wx/setup.h"
#else
#include "../../lib/mswu/wx/setup.h"
#endif

5
ports/wxwidgets/setup.h.in Normal file
View File

@ -0,0 +1,5 @@
#ifdef _DEBUG
#include "../../debug/lib/@WX_SETUP_H_DBG_RELATIVE@/setup.h"
#else
#include "../../lib/@WX_SETUP_H_REL_RELATIVE@/setup.h"
#endif

2
ports/wxwidgets/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "wxwidgets",
"version-semver": "3.1.4",
"port-version": 6,
"port-version": 7,
"description": "a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications.",
"homepage": "https://github.com/wxWidgets/wxWidgets",
"supports": "!uwp",

2
versions/baseline.json
View File

@ -6422,7 +6422,7 @@
},
"wxwidgets": {
"baseline": "3.1.4",
"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": "12acbc593b35e2d327b6fc665c8eed6e25745431",
"version-semver": "3.1.4",
"port-version": 7
},
{
"git-tree": "eed8ba1dc939b1c1a17a05bf409142664015ad4d",
"version-semver": "3.1.4",