mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 01:19:00 +08:00
[corrade] fix core build when cross compiling (#33341)
This commit is contained in:
parent
fbaaad1eb1
commit
aa992d3820
@ -42,6 +42,7 @@ vcpkg_cmake_configure(
|
||||
-DBUILD_STATIC=${BUILD_STATIC}
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
CORRADE_RC_EXECUTABLE
|
||||
UTILITY_USE_ANSI_COLORS
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
@ -51,13 +52,11 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
# corrade-rc is not built when CMAKE_CROSSCOMPILING
|
||||
if("utility" IN_LIST FEATURES)
|
||||
vcpkg_copy_tools(TOOL_NAMES "corrade-rc" AUTO_CLEAN)
|
||||
endif()
|
||||
vcpkg_copy_tools(TOOL_NAMES "corrade-rc" AUTO_CLEAN)
|
||||
|
||||
# Ensure no empty folders are left behind
|
||||
if(NOT FEATURES)
|
||||
# No features, no binaries (only Corrade.h).
|
||||
if(FEATURES STREQUAL "core")
|
||||
# No features, no libs (only Corrade.h).
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/bin"
|
||||
"${CURRENT_PACKAGES_DIR}/lib"
|
||||
|
@ -1,17 +1,14 @@
|
||||
{
|
||||
"name": "corrade",
|
||||
"version-string": "2020.06",
|
||||
"port-version": 5,
|
||||
"port-version": 6,
|
||||
"description": "C++11/C++14 multiplatform utility library.",
|
||||
"homepage": "https://magnum.graphics/corrade/",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "corrade",
|
||||
"host": true,
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"utility"
|
||||
]
|
||||
"default-features": false
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
|
@ -1766,7 +1766,7 @@
|
||||
},
|
||||
"corrade": {
|
||||
"baseline": "2020.06",
|
||||
"port-version": 5
|
||||
"port-version": 6
|
||||
},
|
||||
"cpp-async": {
|
||||
"baseline": "1.0.1",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "1a278fdbd46715f454e366df7d06410ae2fc9747",
|
||||
"version-string": "2020.06",
|
||||
"port-version": 6
|
||||
},
|
||||
{
|
||||
"git-tree": "fed547a7951672a5a7b1c430df8a9b179f674ac6",
|
||||
"version-string": "2020.06",
|
||||
|
Loading…
Reference in New Issue
Block a user