mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 14:42:48 +08:00
[corrade] Fix VS2019 build error (#17356)
* [corrade] Fix VS2019 build error * Update versions
This commit is contained in:
parent
631177d3f4
commit
25adbcfe41
@ -1,20 +0,0 @@
|
||||
Source: corrade
|
||||
Version: 2020.06
|
||||
Description: C++11/C++14 multiplatform utility library
|
||||
Homepage: https://magnum.graphics/corrade/
|
||||
Default-Features: interconnect, pluginmanager, testsuite, utility
|
||||
|
||||
Feature: interconnect
|
||||
Description: Interconnect library
|
||||
Build-Depends: corrade[utility]
|
||||
|
||||
Feature: pluginmanager
|
||||
Description: PluginManager library
|
||||
Build-Depends: corrade[utility]
|
||||
|
||||
Feature: testsuite
|
||||
Description: TestSuite library
|
||||
Build-Depends: corrade[utility]
|
||||
|
||||
Feature: utility
|
||||
Description: Utility library
|
13
ports/corrade/fix-vs2019.patch
Normal file
13
ports/corrade/fix-vs2019.patch
Normal 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 VERSION_LESS "19.31")
|
||||
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.")
|
@ -4,6 +4,7 @@ vcpkg_from_github(
|
||||
REF v2020.06
|
||||
SHA512 94cc8959b0ee43ecd8d13a25307e7829d53dc6601628d97c32288d1704e2c0835b755bffc06b2105e6aa5a612f119a60e83cb475860b51e6a35999215c100227
|
||||
HEAD_REF master
|
||||
PATCHES fix-vs2019.patch
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
|
||||
|
51
ports/corrade/vcpkg.json
Normal file
51
ports/corrade/vcpkg.json
Normal file
@ -0,0 +1,51 @@
|
||||
{
|
||||
"name": "corrade",
|
||||
"version-string": "2020.06",
|
||||
"port-version": 1,
|
||||
"description": "C++11/C++14 multiplatform utility library.",
|
||||
"homepage": "https://magnum.graphics/corrade/",
|
||||
"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"
|
||||
}
|
||||
}
|
||||
}
|
@ -1358,7 +1358,7 @@
|
||||
},
|
||||
"corrade": {
|
||||
"baseline": "2020.06",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"cpp-base64": {
|
||||
"baseline": "2019-06-19",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "12cd1f62edbe4e05de794c862facfdfd0fe8171d",
|
||||
"version-string": "2020.06",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "f96e0a1ac4f3b72bedf9f1bf099bb91cceba0456",
|
||||
"version-string": "2020.06",
|
||||
|
Loading…
Reference in New Issue
Block a user