diff options
| author | Emerson de Freitas Barcelos <emersonfxbx@msn.com> | 2020-07-31 15:30:41 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 11:30:41 -0700 |
| commit | 544222febd8683aee282ab5ea1d358b118f6168d (patch) | |
| tree | 5af879da09cbc981755b4fe2c6c459db47b9c27f | |
| parent | c2b5201e1f73c5e69618525035586079c48495ed (diff) | |
| download | vcpkg-544222febd8683aee282ab5ea1d358b118f6168d.tar.gz vcpkg-544222febd8683aee282ab5ea1d358b118f6168d.zip | |
[wxwidgets] Adding wxWidgets resource compiler (wxrc) to <triplet>/tools/wxwidgets directory (#12485)
* Adding wxWidgets resource compiler (wxrc) to <triplet>/tools/wxwidgets directory
* Fix tool missing dependencies
* CONTROL file version update
* Update ports/wxwidgets/portfile.cmake
* Update ports/wxwidgets/portfile.cmake
* Fix the build failures
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
| -rw-r--r-- | ports/wxwidgets/CONTROL | 3 | ||||
| -rw-r--r-- | ports/wxwidgets/portfile.cmake | 14 |
2 files changed, 10 insertions, 7 deletions
diff --git a/ports/wxwidgets/CONTROL b/ports/wxwidgets/CONTROL index e69ead3ad..4e12b7690 100644 --- a/ports/wxwidgets/CONTROL +++ b/ports/wxwidgets/CONTROL @@ -1,5 +1,6 @@ Source: wxwidgets -Version: 3.1.3-1 +Version: 3.1.3 +Port-Version: 2 Homepage: https://github.com/wxWidgets/wxWidgets 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 530605782..50414420c 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -1,11 +1,12 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wxWidgets/wxWidgets REF v3.1.3 SHA512 4ecb5c2d13f9bda7aa3c12e887c351a0004509ec24bdd440542bec67e1b6dca20e7838a01236a71dd3cf2e1ba0653c40878047f406464cb2c9ee07c26d6f2599 HEAD_REF master - PATCHES disable-platform-lib-dir.patch fix-macos-clipboard.patch + PATCHES + disable-platform-lib-dir.patch + fix-macos-clipboard.patch ) set(OPTIONS) @@ -37,6 +38,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +vcpkg_copy_tools(TOOL_NAMES wxrc AUTO_CLEAN) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") @@ -56,14 +59,13 @@ if(DLLS) endforeach() 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) + +file(INSTALL ${SOURCE_PATH}/docs/licence.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |