[corrade] Fix build error on vs2019 (#20655)

This commit is contained in:
NancyLi1013 2021-10-12 11:43:05 +08:00 committed by GitHub
parent 143cfa363c
commit 9deacd9e5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 14 deletions

View File

@ -7,7 +7,7 @@ index e0cc288..e5a4648 100644
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")
+ 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.")

View File

@ -25,7 +25,7 @@ endforeach()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA # Disable this option if project cannot be built with Ninja
OPTIONS
${FEATURE_OPTIONS}
@ -36,8 +36,8 @@ vcpkg_configure_cmake(
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)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Install tools
if("utility" IN_LIST FEATURES)
@ -49,22 +49,22 @@ endif()
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)
"${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)
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING
DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
file(INSTALL "${SOURCE_PATH}/COPYING"
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
RENAME copyright)
vcpkg_copy_pdbs()

View File

@ -1,7 +1,7 @@
{
"name": "corrade",
"version-string": "2020.06",
"port-version": 2,
"port-version": 3,
"description": "C++11/C++14 multiplatform utility library.",
"homepage": "https://magnum.graphics/corrade/",
"default-features": [

View File

@ -1482,7 +1482,7 @@
},
"corrade": {
"baseline": "2020.06",
"port-version": 2
"port-version": 3
},
"cpp-base64": {
"baseline": "V2.rc.08",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "087770e2a196c44cb1b56473bd57797ed9b9bc87",
"version-string": "2020.06",
"port-version": 3
},
{
"git-tree": "ec9f53411152ed98e9d591afed7e34e65fb7abeb",
"version-string": "2020.06",