Title: [206418] trunk/Source/ThirdParty
Revision
206418
Author
commit-qu...@webkit.org
Date
2016-09-27 00:03:53 -0700 (Tue, 27 Sep 2016)

Log Message

Fixed compilation of WOFF2 on Windows
https://bugs.webkit.org/show_bug.cgi?id=162570

Patch by Konstantin Tokarev  <annu...@yandex.ru> and Vitaliy Slobodin <vitaliy.slobo...@gmail.com> on 2016-09-27
Reviewed by Alex Christensen.

* woff2/CMakeLists.txt: Avoid passing GCC-specific flags to other
compilers.
* woff2/src/port.h: Include assert.h.

Modified Paths

Diff

Modified: trunk/Source/ThirdParty/ChangeLog (206417 => 206418)


--- trunk/Source/ThirdParty/ChangeLog	2016-09-27 06:18:27 UTC (rev 206417)
+++ trunk/Source/ThirdParty/ChangeLog	2016-09-27 07:03:53 UTC (rev 206418)
@@ -1,3 +1,14 @@
+2016-09-27  Konstantin Tokarev  <annu...@yandex.ru> and Vitaliy Slobodin  <vitaliy.slobo...@gmail.com>
+
+        Fixed compilation of WOFF2 on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=162570
+
+        Reviewed by Alex Christensen.
+
+        * woff2/CMakeLists.txt: Avoid passing GCC-specific flags to other
+        compilers.
+        * woff2/src/port.h: Include assert.h.
+
 2016-06-19  Frederic Wang  <fred.w...@free.fr>
 
         Update Brotli to version 0.4.0

Modified: trunk/Source/ThirdParty/woff2/CMakeLists.txt (206417 => 206418)


--- trunk/Source/ThirdParty/woff2/CMakeLists.txt	2016-09-27 06:18:27 UTC (rev 206417)
+++ trunk/Source/ThirdParty/woff2/CMakeLists.txt	2016-09-27 07:03:53 UTC (rev 206418)
@@ -16,4 +16,6 @@
 add_library(woff2 STATIC ${WOFF2_SOURCES})
 target_link_libraries(woff2 brotli)
 WEBKIT_SET_EXTRA_COMPILER_FLAGS(woff2)
-ADD_TARGET_PROPERTIES(woff2 COMPILE_FLAGS "-Wno-sign-compare -Wno-unused-but-set-variable")
+if (COMPILER_IS_GCC_OR_CLANG)
+    ADD_TARGET_PROPERTIES(woff2 COMPILE_FLAGS "-Wno-sign-compare -Wno-unused-but-set-variable")
+endif ()

Modified: trunk/Source/ThirdParty/woff2/src/port.h (206417 => 206418)


--- trunk/Source/ThirdParty/woff2/src/port.h	2016-09-27 06:18:27 UTC (rev 206417)
+++ trunk/Source/ThirdParty/woff2/src/port.h	2016-09-27 07:03:53 UTC (rev 206418)
@@ -17,6 +17,8 @@
 #ifndef WOFF2_PORT_H_
 #define WOFF2_PORT_H_
 
+#include <assert.h>
+
 namespace woff2 {
 
 typedef unsigned int       uint32;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to