[corrade] Add the /permissive- option (#5126)

This commit is contained in:
Cheney Wang 2019-02-07 03:18:53 +08:00 committed by Phil Christensen
parent 6509199a2a
commit f5b06a9ef0
3 changed files with 18 additions and 1 deletions

View File

@ -1,5 +1,5 @@
Source: corrade
Version: 2018.10-1
Version: 2018.10-2
Description: C++11/C++14 multiplatform utility library http://magnum.graphics/corrade/
Default-Features: interconnect, pluginmanager, testsuite, utility

View File

@ -0,0 +1,16 @@
diff --git a/modules/UseCorrade.cmake b/modules/UseCorrade.cmake
index 744d5a1..129e75f 100644
--- a/modules/UseCorrade.cmake
+++ b/modules/UseCorrade.cmake
@@ -164,7 +164,10 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_SIMULATE_ID STREQUAL "
# "dllexport and extern are incompatible on an explicit instantiation".
# Why the error is emitted only on classes? Functions are okay with
# dllexport extern?!
- "/wd4910")
+ "/wd4910"
+
+ #Add the /permissive- option
+ "/permissive-")
set(CORRADE_PEDANTIC_COMPILER_DEFINITIONS
# Disabling warning for not using "secure-but-not-standard" STL algos
"_CRT_SECURE_NO_WARNINGS" "_SCL_SECURE_NO_WARNINGS"

View File

@ -5,6 +5,7 @@ vcpkg_from_github(
REF v2018.10
SHA512 594c15d9622fa0abdf893c15054f27bdcc40b5de1543d722b7173138ec5d299c45b7a85376ed617cdf9b4f52a05bf7a3d1ea1983e112b62690211116c255d201
HEAD_REF master
PATCHES fixC2666.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)