Unreviewed, silence -Wimplicit-fallthrough in openvr
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 5 Feb 2018 22:19:17 +0000 (22:19 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 5 Feb 2018 22:19:17 +0000 (22:19 +0000)
https://bugs.webkit.org/show_bug.cgi?id=182117

* openvr/patches/cmake-build.patch:
* openvr/src/CMakeLists.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@228126 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/ChangeLog
Source/ThirdParty/openvr/patches/cmake-build.patch
Source/ThirdParty/openvr/src/CMakeLists.txt

index 5647c13..457bb2d 100644 (file)
@@ -1,3 +1,11 @@
+2018-02-05  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Unreviewed, silence -Wimplicit-fallthrough in openvr
+        https://bugs.webkit.org/show_bug.cgi?id=182117
+
+        * openvr/patches/cmake-build.patch:
+        * openvr/src/CMakeLists.txt:
+
 2018-02-04  Zan Dobersek  <zdobersek@igalia.com>
 
         Lots of build warnings from Source/ThirdParty/openvr
index 2c14029..01f9a7c 100644 (file)
@@ -65,7 +65,7 @@ index e58c9e1c039..095f81e562b 100644
  
  if(USE_CUSTOM_LIBCXX)
         link_directories(
-@@ -65,28 +67,34 @@ elseif(BUILD_FRAMEWORK)
+@@ -65,28 +67,35 @@ elseif(BUILD_FRAMEWORK)
         set( LIBNAME "OpenVR" )
         add_library( ${LIBNAME} 
              SHARED ${SOURCE_FILES}
@@ -99,7 +99,8 @@ index e58c9e1c039..095f81e562b 100644
  endif()
  
 +if (COMPILER_IS_GCC_OR_CLANG)
-+    WEBKIT_ADD_TARGET_CXX_FLAGS(${LIBNAME} -Wno-unknown-pragmas
++    WEBKIT_ADD_TARGET_CXX_FLAGS(${LIBNAME} -Wno-implicit-fallthrough
++                                           -Wno-unknown-pragmas
 +                                           -Wno-unused-parameter
 +                                           -Wno-unused-variable)
 +endif()
index 095f81e..24440d3 100644 (file)
@@ -90,7 +90,8 @@ else()
 endif()
 
 if (COMPILER_IS_GCC_OR_CLANG)
-    WEBKIT_ADD_TARGET_CXX_FLAGS(${LIBNAME} -Wno-unknown-pragmas
+    WEBKIT_ADD_TARGET_CXX_FLAGS(${LIBNAME} -Wno-implicit-fallthrough
+                                           -Wno-unknown-pragmas
                                            -Wno-unused-parameter
                                            -Wno-unused-variable)
 endif()