mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 03:03:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[glm] Ignore MSVC warning C4201

Browse Source
This commit is contained in:
Mark Garcia 2017-12-19 15:25:03 +08:00
parent 76096c95f1
commit dde10c4936
3 changed files with 134 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/glm/CONTROL
View File

@ -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

128
ports/glm/ignore-warning-C4201.patch Normal file
View File

@ -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

5
ports/glm/portfile.cmake
View File

@ -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}
)