[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.

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

diff --git a/ChangeLog b/ChangeLog
index b842bbe..4e2df59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-08-06  Alex Christensen  <achristensen@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  <achristensen@webkit.org>
 
         Fix quirks with CMake and VS2015

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 63518ae..319b130 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -3284,6 +3284,7 @@ set(WebCoreTestSupport_SOURCES
     testing/InternalSettings.cpp
     testing/Internals.cpp
     testing/MicroTaskTest.cpp
+    testing/MockCDM.cpp
     testing/MockPageOverlayClient.cpp
 
     testing/js/WebCoreTestSupport.cpp

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f1b9de0..0016fc0 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2015-08-06  Alex Christensen  <achristensen@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  <fpizlo@apple.com>
 
         Lightweight locks should be adaptive

diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake
index 74a28e2..2136b1e 100644 (file)
--- a/Source/cmake/OptionsWinCairo.cmake
+++ b/Source/cmake/OptionsWinCairo.cmake
@@ -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)