Title: [188101] trunk
Revision
188101
Author
achristen...@apple.com
Date
2015-08-06 18:03:54 -0700 (Thu, 06 Aug 2015)

Log Message

[Win] CMake build fix after r188098.

.:

* Source/cmake/OptionsWinCairo.cmake:
OptionsWindows.cmake uses WTF_PLATFORM_WIN_CAIRO now, so we need to set it before including OptionsWindows.

Source/WebCore:

* CMakeLists.txt:
MockCDM is necessary for testing if ENCRYPTED_MEDIA_V2 is enabled.

Modified Paths

Diff

Modified: trunk/ChangeLog (188100 => 188101)


--- trunk/ChangeLog	2015-08-07 00:49:54 UTC (rev 188100)
+++ trunk/ChangeLog	2015-08-07 01:03:54 UTC (rev 188101)
@@ -1,3 +1,10 @@
+2015-08-06  Alex Christensen  <achristen...@webkit.org>
+
+        [Win] CMake build fix after r188098.
+
+        * Source/cmake/OptionsWinCairo.cmake:
+        OptionsWindows.cmake uses WTF_PLATFORM_WIN_CAIRO now, so we need to set it before including OptionsWindows.
+
 2015-08-04  Alex Christensen  <achristen...@webkit.org>
 
         Fix quirks with CMake and VS2015

Modified: trunk/Source/WebCore/CMakeLists.txt (188100 => 188101)


--- trunk/Source/WebCore/CMakeLists.txt	2015-08-07 00:49:54 UTC (rev 188100)
+++ trunk/Source/WebCore/CMakeLists.txt	2015-08-07 01:03:54 UTC (rev 188101)
@@ -3284,6 +3284,7 @@
     testing/InternalSettings.cpp
     testing/Internals.cpp
     testing/MicroTaskTest.cpp
+    testing/MockCDM.cpp
     testing/MockPageOverlayClient.cpp
 
     testing/js/WebCoreTestSupport.cpp

Modified: trunk/Source/WebCore/ChangeLog (188100 => 188101)


--- trunk/Source/WebCore/ChangeLog	2015-08-07 00:49:54 UTC (rev 188100)
+++ trunk/Source/WebCore/ChangeLog	2015-08-07 01:03:54 UTC (rev 188101)
@@ -1,3 +1,10 @@
+2015-08-06  Alex Christensen  <achristen...@webkit.org>
+
+        [Win] CMake build fix after r188098.
+
+        * CMakeLists.txt:
+        MockCDM is necessary for testing if ENCRYPTED_MEDIA_V2 is enabled.
+
 2015-08-05  Filip Pizlo  <fpi...@apple.com>
 
         Lightweight locks should be adaptive

Modified: trunk/Source/cmake/OptionsWinCairo.cmake (188100 => 188101)


--- trunk/Source/cmake/OptionsWinCairo.cmake	2015-08-07 00:49:54 UTC (rev 188100)
+++ trunk/Source/cmake/OptionsWinCairo.cmake	2015-08-07 01:03:54 UTC (rev 188101)
@@ -1,6 +1,7 @@
+set(WTF_PLATFORM_WIN_CAIRO 1)
+
 include(OptionsWindows)
 
-set(WTF_PLATFORM_WIN_CAIRO 1)
 set(USE_CF 1)
 set(USE_CURL 1)
 set(USE_ICU_UNICODE 1)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to