diff options
| author | Cheney Wang <38240633+Cheney-W@users.noreply.github.com> | 2019-02-07 03:18:53 +0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-02-06 11:18:53 -0800 |
| commit | f5b06a9ef0b34ef63ed9d2dfca978781a73eaea2 (patch) | |
| tree | 8027cece7425a5eaaf3c9195d84879a16206470c | |
| parent | 6509199a2aeb882c91babb7cc95ef36b30738091 (diff) | |
| download | vcpkg-f5b06a9ef0b34ef63ed9d2dfca978781a73eaea2.tar.gz vcpkg-f5b06a9ef0b34ef63ed9d2dfca978781a73eaea2.zip | |
[corrade] Add the /permissive- option (#5126)
| -rw-r--r-- | ports/corrade/CONTROL | 2 | ||||
| -rw-r--r-- | ports/corrade/fixC2666.patch | 16 | ||||
| -rw-r--r-- | ports/corrade/portfile.cmake | 1 |
3 files changed, 18 insertions, 1 deletions
diff --git a/ports/corrade/CONTROL b/ports/corrade/CONTROL index 116a9f7e7..8e7205158 100644 --- a/ports/corrade/CONTROL +++ b/ports/corrade/CONTROL @@ -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 diff --git a/ports/corrade/fixC2666.patch b/ports/corrade/fixC2666.patch new file mode 100644 index 000000000..e6e2ffccc --- /dev/null +++ b/ports/corrade/fixC2666.patch @@ -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"
diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index 0a6f1babb..c5b5780bd 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -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) |