[WinCairo] Consolidate CMake code related to CURL
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Jul 2017 21:26:23 +0000 (21:26 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Jul 2017 21:26:23 +0000 (21:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=170860

Reviewed by Alex Christensen.

.:

* Source/cmake/OptionsWinCairo.cmake:

Source/WebCore:

No new tests. No change in functionality.

* PlatformWinCairo.cmake:
* platform/Curl.cmake: Added.

Source/WebKit:

* PlatformWin.cmake:

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

ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/PlatformWinCairo.cmake
Source/WebCore/platform/Curl.cmake [new file with mode: 0644]
Source/WebKit/ChangeLog
Source/WebKit/PlatformWin.cmake
Source/cmake/OptionsWinCairo.cmake

index 6bfd230..d6d1ba0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-07-05  Don Olmstead  <don.olmstead@sony.com>
+
+        [WinCairo] Consolidate CMake code related to CURL
+        https://bugs.webkit.org/show_bug.cgi?id=170860
+
+        Reviewed by Alex Christensen.
+
+        * Source/cmake/OptionsWinCairo.cmake:
+
 2017-06-28  Stephan Szabo  <stephan.szabo@am.sony.com>
 
         [Win] Build JSCOnly on Windows with clang-cl
index 499eb5f..9bac0b8 100644 (file)
@@ -1,3 +1,15 @@
+2017-07-05  Don Olmstead  <don.olmstead@sony.com>
+
+        [WinCairo] Consolidate CMake code related to CURL
+        https://bugs.webkit.org/show_bug.cgi?id=170860
+
+        Reviewed by Alex Christensen.
+
+        No new tests. No change in functionality.
+
+        * PlatformWinCairo.cmake:
+        * platform/Curl.cmake: Added.
+
 2017-07-03  Myles C. Maxfield  <mmaxfield@apple.com>
 
         Remove copy of ICU headers from WebKit
index 837582d..e6a2981 100644 (file)
@@ -1,4 +1,5 @@
 include(platform/Cairo.cmake)
+include(platform/Curl.cmake)
 include(platform/ImageDecoders.cmake)
 include(platform/TextureMapper.cmake)
 
@@ -10,7 +11,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBKIT_LIBRARIES_DIR}/include/zlib"
     "${WEBCORE_DIR}/loader/archive/cf"
     "${WEBCORE_DIR}/platform/cf"
-    "${WEBCORE_DIR}/platform/network/curl"
 )
 
 list(APPEND WebCore_SOURCES
@@ -29,23 +29,6 @@ list(APPEND WebCore_SOURCES
 
     platform/network/NetworkStorageSessionStub.cpp
 
-    platform/network/curl/CookieJarCurl.cpp
-    platform/network/curl/CredentialStorageCurl.cpp
-    platform/network/curl/CurlCacheEntry.cpp
-    platform/network/curl/CurlCacheManager.cpp
-    platform/network/curl/CurlContext.cpp
-    platform/network/curl/CurlDownload.cpp
-    platform/network/curl/CurlJobManager.cpp
-    platform/network/curl/DNSCurl.cpp
-    platform/network/curl/FormDataStreamCurl.cpp
-    platform/network/curl/MultipartHandle.cpp
-    platform/network/curl/ProxyServerCurl.cpp
-    platform/network/curl/ResourceHandleCurl.cpp
-    platform/network/curl/ResourceHandleManager.cpp
-    platform/network/curl/SSLHandle.cpp
-    platform/network/curl/SocketStreamHandleImplCurl.cpp
-    platform/network/curl/SynchronousLoaderClientCurl.cpp
-
     platform/text/win/LocaleWin.cpp
 
     platform/win/DelayLoadedModulesEnumerator.cpp
diff --git a/Source/WebCore/platform/Curl.cmake b/Source/WebCore/platform/Curl.cmake
new file mode 100644 (file)
index 0000000..72c6834
--- /dev/null
@@ -0,0 +1,32 @@
+list(APPEND WebCore_INCLUDE_DIRECTORIES
+    "${WEBCORE_DIR}/platform/network/curl"
+)
+
+list(APPEND WebCore_SOURCES
+    platform/network/curl/CookieJarCurl.cpp
+    platform/network/curl/CredentialStorageCurl.cpp
+    platform/network/curl/CurlCacheEntry.cpp
+    platform/network/curl/CurlCacheManager.cpp
+    platform/network/curl/CurlContext.cpp
+    platform/network/curl/CurlDownload.cpp
+    platform/network/curl/CurlJobManager.cpp
+    platform/network/curl/DNSCurl.cpp
+    platform/network/curl/FormDataStreamCurl.cpp
+    platform/network/curl/MultipartHandle.cpp
+    platform/network/curl/ProxyServerCurl.cpp
+    platform/network/curl/ResourceHandleCurl.cpp
+    platform/network/curl/ResourceHandleManager.cpp
+    platform/network/curl/SSLHandle.cpp
+    platform/network/curl/SocketStreamHandleImplCurl.cpp
+    platform/network/curl/SynchronousLoaderClientCurl.cpp
+)
+
+list(APPEND WebCore_INCLUDE_DIRECTORIES
+    ${CURL_INCLUDE_DIRS}
+    ${OPENSSL_INCLUDE_DIR}
+)
+
+list(APPEND WebCore_LIBRARIES
+    ${CURL_LIBRARIES}
+    ${OPENSSL_LIBRARIES}
+)
index 21b2d3f..9b03cbe 100644 (file)
@@ -1,3 +1,12 @@
+2017-07-05  Don Olmstead  <don.olmstead@sony.com>
+
+        [WinCairo] Consolidate CMake code related to CURL
+        https://bugs.webkit.org/show_bug.cgi?id=170860
+
+        Reviewed by Alex Christensen.
+
+        * PlatformWin.cmake:
+
 2017-06-26  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         [WTF] Drop Thread::create(obsolete things) API since we can use lambda
index 0256cb0..8336e38 100644 (file)
@@ -11,9 +11,8 @@ if (${WTF_PLATFORM_WIN_CAIRO})
         win/WebURLAuthenticationChallengeSenderCURL.cpp
     )
     list(APPEND WebKit_LIBRARIES
-        PRIVATE libeay32.lib
+        ${OPENSSL_LIBRARIES}
         PRIVATE mfuuid.lib
-        PRIVATE ssleay32.lib
         PRIVATE strmiids.lib
     )
 else ()
index b4b5c11..3bba225 100644 (file)
@@ -3,6 +3,8 @@ set(WTF_PLATFORM_WIN_CAIRO 1)
 include(OptionsWin)
 
 find_package(Cairo 1.14.4 REQUIRED)
+find_package(CURL 7.45.0 REQUIRED)
+find_package(OpenSSL REQUIRED)
 
 SET_AND_EXPOSE_TO_BUILD(USE_CAIRO ON)