From d9096e70e0939802e6c3a49236c016668e9b2bc0 Mon Sep 17 00:00:00 2001 From: "achristensen@apple.com" Date: Fri, 7 Aug 2015 01:03:54 +0000 Subject: [PATCH] [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 --- ChangeLog | 7 +++++++ Source/WebCore/CMakeLists.txt | 1 + Source/WebCore/ChangeLog | 7 +++++++ Source/cmake/OptionsWinCairo.cmake | 3 ++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b842bbe..4e2df59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-08-06 Alex Christensen + + [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 Fix quirks with CMake and VS2015 diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt index 63518ae..319b130 100644 --- 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 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,10 @@ +2015-08-06 Alex Christensen + + [Win] CMake build fix after r188098. + + * CMakeLists.txt: + MockCDM is necessary for testing if ENCRYPTED_MEDIA_V2 is enabled. + 2015-08-05 Filip Pizlo Lightweight locks should be adaptive diff --git a/Source/cmake/OptionsWinCairo.cmake b/Source/cmake/OptionsWinCairo.cmake index 74a28e2..2136b1e 100644 --- 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) -- 1.8.3.1