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

[wxwidgets] Adding wxWidgets resource compiler (wxrc) to <triplet>/tools/wxwidgets directory (#12485)

Browse Source 
* 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>
This commit is contained in:
Emerson de Freitas Barcelos 2020-07-31 15:30:41 -03:00 committed by GitHub
parent c2b5201e1f
commit 544222febd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/wxwidgets/CONTROL
View File

@ -1,5 +1,6 @@
Source: wxwidgets Source: wxwidgets
Version: 3.1.3-1 Version: 3.1.3
Port-Version: 2
Homepage: https://github.com/wxWidgets/wxWidgets 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. 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 Build-Depends: zlib, libpng, tiff, expat

14
ports/wxwidgets/portfile.cmake
View File

@ -1,11 +1,12 @@
include(vcpkg_common_functions)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO wxWidgets/wxWidgets REPO wxWidgets/wxWidgets
REF v3.1.3 REF v3.1.3
SHA512 4ecb5c2d13f9bda7aa3c12e887c351a0004509ec24bdd440542bec67e1b6dca20e7838a01236a71dd3cf2e1ba0653c40878047f406464cb2c9ee07c26d6f2599 SHA512 4ecb5c2d13f9bda7aa3c12e887c351a0004509ec24bdd440542bec67e1b6dca20e7838a01236a71dd3cf2e1ba0653c40878047f406464cb2c9ee07c26d6f2599
HEAD_REF master 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) set(OPTIONS)
@ -37,6 +38,8 @@ vcpkg_configure_cmake(
vcpkg_install_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(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll")
@ -56,14 +59,13 @@ if(DLLS)
endforeach() endforeach()
endif() 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) 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) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h ${CURRENT_PACKAGES_DIR}/include/wx/setup.h)
endif() endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/mswu) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/mswu)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/mswud) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/mswud)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/msvc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/msvc)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/docs/licence.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)