early-access version 2853
This commit is contained in:
27
externals/vcpkg/ports/corrade/build-corrade-rc-always.patch
vendored
Executable file
27
externals/vcpkg/ports/corrade/build-corrade-rc-always.patch
vendored
Executable file
@@ -0,0 +1,27 @@
|
||||
--- a/src/Corrade/Utility/CMakeLists.txt
|
||||
+++ b/src/Corrade/Utility/CMakeLists.txt
|
||||
@@ -185,13 +185,12 @@
|
||||
# corrade-rc when generating WinRT targets by setting
|
||||
# set_target_properties(corrade-rc PROPERTIES VS_WINRT_COMPONENT OFF)
|
||||
# Then this would be if(NOT CMAKE_CROSSCOMPILING OR CORRADE_TARGET_WINDOWS_RT).
|
||||
# However, it seems like this feature never materialized, as doing this will
|
||||
# result in corrade-rc that's looking for vcruntime140_app.dll in order to be
|
||||
# run. Last checked: Nov 2019.
|
||||
-if(NOT CMAKE_CROSSCOMPILING)
|
||||
# Sources for standalone corrade-rc
|
||||
set(CorradeUtilityRc_SRCS
|
||||
Arguments.cpp
|
||||
Debug.cpp
|
||||
Directory.cpp
|
||||
Configuration.cpp
|
||||
@@ -235,9 +234,10 @@
|
||||
if(CORRADE_TARGET_UNIX)
|
||||
target_link_libraries(corrade-rc PRIVATE ${CMAKE_DL_LIBS})
|
||||
endif()
|
||||
set_target_properties(corrade-rc PROPERTIES FOLDER "Corrade/Utility")
|
||||
install(TARGETS corrade-rc DESTINATION ${CORRADE_BINARY_INSTALL_DIR})
|
||||
|
||||
+if(NOT CMAKE_CROSSCOMPILING)
|
||||
# Corrade::rc target alias for superprojects
|
||||
add_executable(Corrade::rc ALIAS corrade-rc)
|
||||
endif()
|
||||
13
externals/vcpkg/ports/corrade/fix-vs2019.patch
vendored
Executable file
13
externals/vcpkg/ports/corrade/fix-vs2019.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e0cc288..e5a4648 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -195,7 +195,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
|
||||
set(MSVC2017_COMPATIBILITY ON)
|
||||
message(WARNING "MSVC 2017 detected, automatically enabling MSVC2017_COMPATIBILITY. Note that some features may not be available with this compiler.")
|
||||
endif()
|
||||
- elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.30")
|
||||
+ elseif(CMAKE_CXX_COMPILER_VERSION GREATER "19.20")
|
||||
if(NOT MSVC2019_COMPATIBILITY)
|
||||
set(MSVC2019_COMPATIBILITY ON)
|
||||
message(WARNING "MSVC 2019 detected, automatically enabling MSVC2019_COMPATIBILITY. Note that some features may not be available with this compiler.")
|
||||
81
externals/vcpkg/ports/corrade/portfile.cmake
vendored
Executable file
81
externals/vcpkg/ports/corrade/portfile.cmake
vendored
Executable file
@@ -0,0 +1,81 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO mosra/corrade
|
||||
REF v2020.06
|
||||
SHA512 94cc8959b0ee43ecd8d13a25307e7829d53dc6601628d97c32288d1704e2c0835b755bffc06b2105e6aa5a612f119a60e83cb475860b51e6a35999215c100227
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-vs2019.patch
|
||||
build-corrade-rc-always.patch
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
|
||||
|
||||
# Handle features
|
||||
set(_COMPONENTS "")
|
||||
foreach(_feature IN LISTS ALL_FEATURES)
|
||||
# Uppercase the feature name and replace "-" with "_"
|
||||
string(TOUPPER "${_feature}" _FEATURE)
|
||||
string(REPLACE "-" "_" _FEATURE "${_FEATURE}")
|
||||
|
||||
# Final feature is empty, ignore it
|
||||
if(_feature)
|
||||
list(APPEND _COMPONENTS ${_feature} WITH_${_FEATURE})
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS})
|
||||
|
||||
set(corrade_rc_param "")
|
||||
if(VCPKG_CROSSCOMPILING)
|
||||
set(corrade_rc_param
|
||||
"-DCORRADE_RC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/corrade/corrade-rc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
|
||||
)
|
||||
endif()
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
PREFER_NINJA # Disable this option if project cannot be built with Ninja
|
||||
OPTIONS
|
||||
${FEATURE_OPTIONS}
|
||||
"${corrade_rc_param}"
|
||||
-DUTILITY_USE_ANSI_COLORS=ON
|
||||
-DBUILD_STATIC=${BUILD_STATIC}
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
CORRADE_RC_EXECUTABLE
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
|
||||
# Debug includes and share are the same as release
|
||||
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()
|
||||
|
||||
# Ensure no empty folders are left behind
|
||||
if(NOT FEATURES)
|
||||
# No features, no binaries (only Corrade.h).
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/bin"
|
||||
"${CURRENT_PACKAGES_DIR}/lib"
|
||||
"${CURRENT_PACKAGES_DIR}/debug")
|
||||
# debug is completely empty, as include and share
|
||||
# have already been removed.
|
||||
|
||||
elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
# No dlls
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/bin"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
endif()
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL "${SOURCE_PATH}/COPYING"
|
||||
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
|
||||
RENAME copyright)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
61
externals/vcpkg/ports/corrade/vcpkg.json
vendored
Executable file
61
externals/vcpkg/ports/corrade/vcpkg.json
vendored
Executable file
@@ -0,0 +1,61 @@
|
||||
{
|
||||
"name": "corrade",
|
||||
"version-string": "2020.06",
|
||||
"port-version": 4,
|
||||
"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": [
|
||||
"interconnect",
|
||||
"pluginmanager",
|
||||
"testsuite",
|
||||
"utility"
|
||||
],
|
||||
"features": {
|
||||
"interconnect": {
|
||||
"description": "Interconnect library",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "corrade",
|
||||
"features": [
|
||||
"utility"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"pluginmanager": {
|
||||
"description": "PluginManager library",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "corrade",
|
||||
"features": [
|
||||
"utility"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"testsuite": {
|
||||
"description": "TestSuite library",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "corrade",
|
||||
"features": [
|
||||
"utility"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"utility": {
|
||||
"description": "Utility library"
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user