diff options
| author | Jonathan Hale <Squareys@googlemail.com> | 2020-07-14 17:38:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-14 08:38:18 -0700 |
| commit | 5e40afca0d7286a9a7d742822cc2a1179a9e63fc (patch) | |
| tree | 4e83343034a70f029a180a78d9fbab3971c222ba /ports/corrade | |
| parent | 9891a8f2132aa18cdc6f96862ee5406f2d901b0e (diff) | |
| download | vcpkg-5e40afca0d7286a9a7d742822cc2a1179a9e63fc.tar.gz vcpkg-5e40afca0d7286a9a7d742822cc2a1179a9e63fc.zip | |
[corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06 (#12211)
* [magnum] Improve maintainability of feature to cmake flag conversion
* [magnum] Ignore features not supported on current platform
Allows `vcpkg install magnum[*]` on any platform.
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum] Add cglcontext and windowlesscglapplication features
* docs: Update valid VCPKG_CMAKE_SYSTEM_NAME values
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Replace deprecated basisu with archive download
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Add meshoptimizersceneconverter feature
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Also use vcpkg_check_features
Analog to magnum port.
Signed-off-by: Squareys <squareys@googlemail.com>
* [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06
Signed-off-by: Squareys <squareys@googlemail.com>
* [meshoptimizer] Add initial port
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Replace meshoptimizer download with feature dependency
Signed-off-by: Squareys <squareys@googlemail.com>
* [corrade,magnum-*] Fix license installation command
Signed-off-by: Squareys <squareys@googlemail.com>
* [meshoptimizer] Use vcpkg_fixup_cmake_targets
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/corrade')
| -rw-r--r-- | ports/corrade/CONTROL | 2 | ||||
| -rw-r--r-- | ports/corrade/portfile.cmake | 29 |
2 files changed, 8 insertions, 23 deletions
diff --git a/ports/corrade/CONTROL b/ports/corrade/CONTROL index 091144941..d59fa6f0a 100644 --- a/ports/corrade/CONTROL +++ b/ports/corrade/CONTROL @@ -1,5 +1,5 @@ Source: corrade -Version: 2019.10-1 +Version: 2020.06 Description: C++11/C++14 multiplatform utility library Homepage: https://magnum.graphics/corrade/ Default-Features: interconnect, pluginmanager, testsuite, utility diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index 3c82bd94b..78c7a2a04 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mosra/corrade - REF v2019.10 - SHA512 5d161f78844b06e1a9979c7e244968a691012e7212e05df3ee3572f5df9aa69e86309f426a89f356f483f6de3871366a8e11b1701a578f865ea738cc8eee515b + REF v2020.06 + SHA512 94cc8959b0ee43ecd8d13a25307e7829d53dc6601628d97c32288d1704e2c0835b755bffc06b2105e6aa5a612f119a60e83cb475860b51e6a35999215c100227 HEAD_REF master ) @@ -31,7 +31,6 @@ vcpkg_configure_cmake( OPTIONS -DUTILITY_USE_ANSI_COLORS=ON -DBUILD_STATIC=${BUILD_STATIC} - ${_CUSTOM_BUILD_FLAGS} ${_COMPONENT_FLAGS} ) @@ -43,21 +42,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Install tools if("utility" IN_LIST FEATURES) - file(GLOB EXES - ${CURRENT_PACKAGES_DIR}/bin/corrade-rc - ${CURRENT_PACKAGES_DIR}/bin/corrade-rc.exe - ) - # Drop a copy of tools - file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/corrade) - - # Tools require dlls - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/corrade) - - file(GLOB TO_REMOVE - ${CURRENT_PACKAGES_DIR}/bin/corrade-rc* - ${CURRENT_PACKAGES_DIR}/debug/bin/corrade-rc*) - file(REMOVE ${TO_REMOVE}) + vcpkg_copy_tools(TOOL_NAMES "corrade-rc" AUTO_CLEAN) endif() # Ensure no empty folders are left behind @@ -78,10 +64,9 @@ elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING - DESTINATION ${CURRENT_PACKAGES_DIR}/share/corrade) -file(RENAME - ${CURRENT_PACKAGES_DIR}/share/corrade/COPYING - ${CURRENT_PACKAGES_DIR}/share/corrade/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright) + vcpkg_copy_pdbs() |