diff options
| author | Juha Sointusalo <juha.sointusalo@gmail.com> | 2018-11-29 08:55:18 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-11-28 22:55:18 -0800 |
| commit | 09103d12a02ac588fe875235c3661ad4bc8cd46a (patch) | |
| tree | 18b1392068bfea4b4bf3b31a1d95d810e072533e | |
| parent | 593d3af5b93284a4decb8f85d7b3f224acc9f5c7 (diff) | |
| download | vcpkg-09103d12a02ac588fe875235c3661ad4bc8cd46a.tar.gz vcpkg-09103d12a02ac588fe875235c3661ad4bc8cd46a.zip | |
[wxwidgets] move setup.h to include (#4846)
* [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.
| -rw-r--r-- | ports/wxwidgets/CONTROL | 2 | ||||
| -rw-r--r-- | ports/wxwidgets/portfile.cmake | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/ports/wxwidgets/CONTROL b/ports/wxwidgets/CONTROL index 48ceab120..af985fa67 100644 --- a/ports/wxwidgets/CONTROL +++ b/ports/wxwidgets/CONTROL @@ -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 diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index e18b8a6ba..062238946 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -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) |