[CMake][Win] Fix !USE(CF) build of WebCore
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Feb 2019 21:06:37 +0000 (21:06 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Feb 2019 21:06:37 +0000 (21:06 +0000)
https://bugs.webkit.org/show_bug.cgi?id=194879

Reviewed by Konstantin Tokarev.

* PlatformAppleWin.cmake:
* PlatformWin.cmake:
* PlatformWinCairo.cmake:

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

Source/WebCore/ChangeLog
Source/WebCore/PlatformAppleWin.cmake
Source/WebCore/PlatformWin.cmake
Source/WebCore/PlatformWinCairo.cmake

index 2399fa5..9efe061 100644 (file)
@@ -1,3 +1,14 @@
+2019-02-21  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake][Win] Fix !USE(CF) build of WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=194879
+
+        Reviewed by Konstantin Tokarev.
+
+        * PlatformAppleWin.cmake:
+        * PlatformWin.cmake:
+        * PlatformWinCairo.cmake:
+
 2019-02-21  Zalan Bujtas  <zalan@apple.com>
 
         [LFC][Floats] Add support for placing formatting roots in-between floats.
index 436ca87..8021bb3 100644 (file)
@@ -65,6 +65,8 @@ list(APPEND WebCore_SOURCES
     platform/network/cf/ResourceResponseCFNet.cpp
     platform/network/cf/SocketStreamHandleImplCFNet.cpp
     platform/network/cf/SynchronousLoaderClientCFNet.cpp
+
+    platform/text/LocaleNone.cpp
 )
 
 if (${USE_DIRECT2D})
index fcb57a4..aae2123 100644 (file)
@@ -22,7 +22,6 @@ list(APPEND WebCore_SOURCES
     accessibility/win/AccessibilityObjectWin.cpp
     accessibility/win/AccessibilityObjectWrapperWin.cpp
 
-    editing/SmartReplaceCF.cpp
     editing/win/EditorWin.cpp
 
     html/HTMLSelectElementWin.cpp
@@ -74,8 +73,6 @@ list(APPEND WebCore_SOURCES
     platform/network/win/DownloadBundleWin.cpp
     platform/network/win/NetworkStateNotifierWin.cpp
 
-    platform/text/LocaleNone.cpp
-
     platform/win/BString.cpp
     platform/win/BitmapInfo.cpp
     platform/win/ClipboardUtilitiesWin.cpp
@@ -244,6 +241,8 @@ if (USE_CF)
     )
 
     list(APPEND WebCore_SOURCES
+        editing/SmartReplaceCF.cpp
+
         loader/archive/cf/LegacyWebArchive.cpp
 
         platform/cf/KeyedDecoderCF.cpp
@@ -264,6 +263,20 @@ if (USE_CF)
 
         platform/cf/win
     )
+
+    list(APPEND WebCore_LIBRARIES ${COREFOUNDATION_LIBRARY})
+    list(APPEND WebCoreTestSupport_LIBRARIES ${COREFOUNDATION_LIBRARY})
+else ()
+    list(APPEND WebCore_SOURCES
+        platform/generic/KeyedDecoderGeneric.cpp
+        platform/generic/KeyedEncoderGeneric.cpp
+
+        platform/text/Hyphenation.cpp
+    )
+
+    list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
+        platform/generic
+    )
 endif ()
 
 if (CMAKE_SIZEOF_VOID_P EQUAL 4)
index 434bc43..b0565a0 100644 (file)
@@ -36,9 +36,7 @@ list(APPEND WebCore_SOURCES
 )
 
 list(APPEND WebCore_LIBRARIES
-    ${CURL_LIBRARY}
     ${DirectX_LIBRARIES}
-    CFLite
     comctl32
     crypt32
     iphlpapi
@@ -52,7 +50,6 @@ list(APPEND WebCore_LIBRARIES
 
 list(APPEND WebCoreTestSupport_LIBRARIES
     ${CAIRO_LIBRARIES}
-    CFLite
     shlwapi
 )