3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[wxwidgets] move setup.h to include (#4846)

Browse Source 
* [wxwidgets] move setup.h to include

Also remove lib/mswu and debug/lib/mswud. They only contain setup.h.

Fixes #3180.
Closes #4251.

* [wxwidgets] remove include/msvc directory

The only thing in include/msvc is include/msvc/wx/setup.h which is a
"wrapper" around the real setup.h. The wrapper setup.h is hard-coded to
include the real setup.h from lib but since the real setup.h is now in
include/wx the wrapper has become useless.

* [wxwidgets] Fix osx build. Slight modernization.
This commit is contained in:
Juha Sointusalo 2018-11-29 08:55:18 +02:00 committed by Robert Schumacher
parent 593d3af5b9
commit 09103d12a0
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/wxwidgets/CONTROL
View File

@ -1,4 +1,4 @@
Source: wxwidgets
Version: 3.1.1
Version: 3.1.1-2
Description: wxWidgets is a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications.
Build-Depends: zlib, libpng, tiff, expat

13
ports/wxwidgets/portfile.cmake
View File

@ -5,11 +5,7 @@ vcpkg_from_github(
REF v3.1.1
SHA512 f6d8974e2f48bae7e96a8938df3ad5efc403036c1dcbe2b48edd276ee7923802ba3e95e3f3bd9db17985e427b8e4f78950df0cbba83ae99d508ed04633816c95
HEAD_REF master
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable-platform-lib-dir.patch"
PATCHES disable-platform-lib-dir.patch
)
vcpkg_configure_cmake(
@ -48,4 +44,11 @@ endif()
# Handle copyright
file(COPY ${SOURCE_PATH}/docs/licence.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxwidgets)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/wxwidgets/licence.txt ${CURRENT_PACKAGES_DIR}/share/wxwidgets/copyright)
if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h ${CURRENT_PACKAGES_DIR}/include/wx/setup.h)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/mswu)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/mswud)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/msvc)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)