diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-12-20 18:59:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-20 18:59:57 -0800 |
| commit | f10a95d5519626e276778fc6c3c59d01f8dd2bea (patch) | |
| tree | c225b00c0566122275feb6d7a7a01169c8028f4b | |
| parent | be3da41b0c3652c79c33436f920a293a35b51266 (diff) | |
| parent | dde10c4936c3f849fcc386524fa7f2135aa11298 (diff) | |
| download | vcpkg-f10a95d5519626e276778fc6c3c59d01f8dd2bea.tar.gz vcpkg-f10a95d5519626e276778fc6c3c59d01f8dd2bea.zip | |
Merge pull request #2403 from markgarcia/msvc-ignore-warning-C4201
[glm] Ignore MSVC warning C4201
| -rw-r--r-- | ports/glm/CONTROL | 2 | ||||
| -rw-r--r-- | ports/glm/ignore-warning-C4201.patch | 128 | ||||
| -rw-r--r-- | ports/glm/portfile.cmake | 5 |
3 files changed, 134 insertions, 1 deletions
diff --git a/ports/glm/CONTROL b/ports/glm/CONTROL index 4e7bad7ee..10a6e5f88 100644 --- a/ports/glm/CONTROL +++ b/ports/glm/CONTROL @@ -1,3 +1,3 @@ Source: glm -Version: 0.9.8.5 +Version: 0.9.8.5-1 Description: OpenGL Mathematics (GLM) https://glm.g-truc.net diff --git a/ports/glm/ignore-warning-C4201.patch b/ports/glm/ignore-warning-C4201.patch new file mode 100644 index 000000000..b94b123db --- /dev/null +++ b/ports/glm/ignore-warning-C4201.patch @@ -0,0 +1,128 @@ +diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp +index f5c7f017..69c7274a 100644 +--- a/glm/detail/type_vec1.hpp ++++ b/glm/detail/type_vec1.hpp +@@ -39,6 +39,10 @@ namespace glm + # pragma clang diagnostic push + # pragma clang diagnostic ignored "-Wgnu-anonymous-struct" + # pragma clang diagnostic ignored "-Wnested-anon-types" ++# endif ++# if GLM_COMPILER & GLM_COMPILER_VC ++# pragma warning(push) ++# pragma warning(disable: 4201) + # endif + + union +@@ -60,6 +64,9 @@ namespace glm + # endif//GLM_SWIZZLE*/ + }; + ++# if GLM_COMPILER & GLM_COMPILER_VC ++# pragma warning(pop) ++# endif + # if GLM_COMPILER & GLM_COMPILER_CLANG + # pragma clang diagnostic pop + # endif +diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp +index a9af32e3..b8b8f32e 100644 +--- a/glm/detail/type_vec2.hpp ++++ b/glm/detail/type_vec2.hpp +@@ -38,6 +38,10 @@ namespace glm + # pragma clang diagnostic push + # pragma clang diagnostic ignored "-Wgnu-anonymous-struct" + # pragma clang diagnostic ignored "-Wnested-anon-types" ++# endif ++# if GLM_COMPILER & GLM_COMPILER_VC ++# pragma warning(push) ++# pragma warning(disable: 4201) + # endif + + union +@@ -60,6 +64,9 @@ namespace glm + + }; + ++# if GLM_COMPILER & GLM_COMPILER_VC ++# pragma warning(pop) ++# endif + # if GLM_COMPILER & GLM_COMPILER_CLANG + # pragma clang diagnostic pop + # endif +diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp +index f85f0a5c..28e6c6ed 100644 +--- a/glm/detail/type_vec3.hpp ++++ b/glm/detail/type_vec3.hpp +@@ -38,6 +38,10 @@ namespace glm + # pragma clang diagnostic push + # pragma clang diagnostic ignored "-Wgnu-anonymous-struct" + # pragma clang diagnostic ignored "-Wnested-anon-types" ++# endif ++# if GLM_COMPILER & GLM_COMPILER_VC ++# pragma warning(push) ++# pragma warning(disable: 4201) + # endif + + union +@@ -59,6 +63,9 @@ namespace glm + # endif//GLM_SWIZZLE + }; + ++# if GLM_COMPILER & GLM_COMPILER_VC ++# pragma warning(pop) ++# endif + # if GLM_COMPILER & GLM_COMPILER_CLANG + # pragma clang diagnostic pop + # endif +diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp +index 5e89b744..0a16bc2c 100644 +--- a/glm/detail/type_vec4.hpp ++++ b/glm/detail/type_vec4.hpp +@@ -38,6 +38,10 @@ namespace glm + # pragma clang diagnostic push + # pragma clang diagnostic ignored "-Wgnu-anonymous-struct" + # pragma clang diagnostic ignored "-Wnested-anon-types" ++# endif ++# if GLM_COMPILER & GLM_COMPILER_VC ++# pragma warning(push) ++# pragma warning(disable: 4201) + # endif + + union +@@ -61,6 +65,9 @@ namespace glm + # endif//GLM_SWIZZLE + }; + ++# if GLM_COMPILER & GLM_COMPILER_VC ++# pragma warning(pop) ++# endif + # if GLM_COMPILER & GLM_COMPILER_CLANG + # pragma clang diagnostic pop + # endif +diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp +index 8af1c8bf..ff8c4aa6 100644 +--- a/glm/gtc/quaternion.hpp ++++ b/glm/gtc/quaternion.hpp +@@ -49,6 +49,10 @@ namespace glm + # pragma clang diagnostic push + # pragma clang diagnostic ignored "-Wgnu-anonymous-struct" + # pragma clang diagnostic ignored "-Wnested-anon-types" ++# endif ++# if GLM_COMPILER & GLM_COMPILER_VC ++# pragma warning(push) ++# pragma warning(disable: 4201) + # endif + + union +@@ -57,6 +61,9 @@ namespace glm + typename detail::storage<T, sizeof(T) * 4, detail::is_aligned<P>::value>::type data; + }; + ++# if GLM_COMPILER & GLM_COMPILER_VC ++# pragma warning(pop) ++# endif + # if GLM_COMPILER & GLM_COMPILER_CLANG + # pragma clang diagnostic pop + # endif +-- +2.15.1.windows.2 + diff --git a/ports/glm/portfile.cmake b/ports/glm/portfile.cmake index 81e764f06..1fb4fe073 100644 --- a/ports/glm/portfile.cmake +++ b/ports/glm/portfile.cmake @@ -8,6 +8,11 @@ vcpkg_from_github( HEAD_REF master ) +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES "${CMAKE_CURRENT_LIST_DIR}/ignore-warning-C4201.patch" +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} ) |