[CMake] Use find_package for SQLite
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Aug 2017 14:36:31 +0000 (14:36 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Aug 2017 14:36:31 +0000 (14:36 +0000)
https://bugs.webkit.org/show_bug.cgi?id=175803

Reviewed by Konstantin Tokarev.

.:

* Source/cmake/OptionsAppleWin.cmake:
* Source/cmake/OptionsWinCairo.cmake:

Source/WebCore:

No new tests. No change in behavior.

* CMakeLists.txt:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* PlatformWPE.cmake:
* PlatformWinCairo.cmake:

Source/WebKitLegacy:

* PlatformWin.cmake:

Tools:

* TestWebKitAPI/PlatformWin.cmake:

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

13 files changed:
ChangeLog
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformGTK.cmake
Source/WebCore/PlatformMac.cmake
Source/WebCore/PlatformWPE.cmake
Source/WebCore/PlatformWinCairo.cmake
Source/WebKitLegacy/ChangeLog
Source/WebKitLegacy/PlatformWin.cmake
Source/cmake/OptionsAppleWin.cmake
Source/cmake/OptionsWinCairo.cmake
Tools/ChangeLog
Tools/TestWebKitAPI/PlatformWin.cmake

index 26e5e1d..9d14ad2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017-08-24  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Use find_package for SQLite
+        https://bugs.webkit.org/show_bug.cgi?id=175803
+
+        Reviewed by Konstantin Tokarev.
+
+        * Source/cmake/OptionsAppleWin.cmake:
+        * Source/cmake/OptionsWinCairo.cmake:
+
 2017-08-23  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 
         [GStreamer][GTK][WPE] Move common things to GStreamer cmake files
index 4daa9cb..b85bd99 100644 (file)
@@ -131,6 +131,7 @@ set(WebCore_INCLUDE_DIRECTORIES
 
 set(WebCore_SYSTEM_INCLUDE_DIRECTORIES
     ${ICU_INCLUDE_DIRS}
+    ${SQLITE_INCLUDE_DIRS}
 )
 
 set(WebCore_IDL_INCLUDES
@@ -3128,6 +3129,7 @@ set(WebCore_PLUG_INS_RESOURCES
 
 set(WebCore_LIBRARIES
     ${ICU_LIBRARIES}
+    ${SQLITE_LIBRARIES}
     JavaScriptCore${DEBUG_SUFFIX}
     PAL${DEBUG_SUFFIX}
 )
index a9a4f9d..c52fdc2 100644 (file)
@@ -1,3 +1,18 @@
+2017-08-24  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Use find_package for SQLite
+        https://bugs.webkit.org/show_bug.cgi?id=175803
+
+        Reviewed by Konstantin Tokarev.
+
+        No new tests. No change in behavior.
+
+        * CMakeLists.txt:
+        * PlatformGTK.cmake:
+        * PlatformMac.cmake:
+        * PlatformWPE.cmake:
+        * PlatformWinCairo.cmake:
+
 2017-08-23  Adrian Perez de Castro  <aperez@igalia.com>
 
         Geoclue2 based backend should provide the right desktop ID
index 652ba95..b0e8906 100644 (file)
@@ -213,7 +213,6 @@ list(APPEND WebCore_LIBRARIES
     ${LIBXML2_LIBRARIES}
     ${LIBXSLT_LIBRARIES}
     ${HYPHEN_LIBRARIES}
-    ${SQLITE_LIBRARIES}
     ${X11_X11_LIB}
     ${X11_Xcomposite_LIB}
     ${X11_Xdamage_LIB}
@@ -236,7 +235,6 @@ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
     ${LIBTASN1_INCLUDE_DIRS}
     ${LIBXML2_INCLUDE_DIR}
     ${LIBXSLT_INCLUDE_DIR}
-    ${SQLITE_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIRS}
 )
 
index 2bdd244..4d1ce0b 100644 (file)
@@ -23,8 +23,8 @@ find_library(QUARTZ_LIBRARY Quartz)
 find_library(QUARTZCORE_LIBRARY QuartzCore)
 find_library(SECURITY_LIBRARY Security)
 find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration)
-find_library(SQLITE3_LIBRARY sqlite3)
 find_library(XML2_LIBRARY XML2)
+find_package(Sqlite REQUIRED)
 find_package(ZLIB REQUIRED)
 
 list(APPEND WebCore_LIBRARIES
index ed24e20..0647df1 100644 (file)
@@ -174,7 +174,6 @@ list(APPEND WebCore_LIBRARIES
     ${LIBTASN1_LIBRARIES}
     ${LIBXML2_LIBRARIES}
     ${LIBXSLT_LIBRARIES}
-    ${SQLITE_LIBRARIES}
     ${WPE_LIBRARIES}
 )
 
@@ -188,7 +187,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     ${LIBTASN1_INCLUDE_DIRS}
     ${LIBXML2_INCLUDE_DIR}
     ${LIBXSLT_INCLUDE_DIR}
-    ${SQLITE_INCLUDE_DIR}
     ${WPE_INCLUDE_DIRS}
 )
 
index e6a2981..c7f7aeb 100644 (file)
@@ -7,7 +7,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${FORWARDING_HEADERS_DIR}/JavaScriptCore"
     "${DirectX_INCLUDE_DIRS}"
     "${WEBKIT_LIBRARIES_DIR}/include"
-    "${WEBKIT_LIBRARIES_DIR}/include/SQLite"
     "${WEBKIT_LIBRARIES_DIR}/include/zlib"
     "${WEBCORE_DIR}/loader/archive/cf"
     "${WEBCORE_DIR}/platform/cf"
@@ -41,7 +40,6 @@ list(APPEND WebCore_SOURCES
 list(APPEND WebCore_LIBRARIES
     ${DirectX_LIBRARIES}
     CFLite
-    SQLite3
     comctl32
     crypt32
     iphlpapi
index 643d510..9106fd1 100644 (file)
@@ -1,3 +1,12 @@
+2017-08-24  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Use find_package for SQLite
+        https://bugs.webkit.org/show_bug.cgi?id=175803
+
+        Reviewed by Konstantin Tokarev.
+
+        * PlatformWin.cmake:
+
 2017-08-20  Chris Dumez  <cdumez@apple.com>
 
         Simplify calls to LoaderStrategy::startPingLoad()
index 019466a..3a248f9 100644 (file)
@@ -3,7 +3,6 @@ if (${WTF_PLATFORM_WIN_CAIRO})
     list(APPEND WebKit_INCLUDE_DIRECTORIES
         ${CAIRO_INCLUDE_DIRS}
         "${WEBKIT_LIBRARIES_DIR}/include"
-        "${WEBKIT_LIBRARIES_DIR}/include/sqlite"
         "${WEBCORE_DIR}/platform/graphics/cairo"
     )
     list(APPEND WebKit_SOURCES_Classes
@@ -26,7 +25,6 @@ else ()
         PRIVATE CoreGraphics${DEBUG_SUFFIX}
         PRIVATE CoreText${DEBUG_SUFFIX}
         PRIVATE QuartzCore${DEBUG_SUFFIX}
-        PRIVATE SQLite3${DEBUG_SUFFIX}
         PRIVATE WebKitSystemInterface${DEBUG_SUFFIX}
         PRIVATE libdispatch${DEBUG_SUFFIX}
         PRIVATE libicuin${DEBUG_SUFFIX}
index dfa3bb2..0268aeb 100644 (file)
@@ -5,6 +5,9 @@ set(USE_CA 1)
 set(USE_CFURLCONNECTION 1)
 set(USE_ICU_UNICODE 1)
 
+# Libraries where find_package does not work
+set(SQLITE_LIBRARIES SQLite3${DEBUG_SUFFIX})
+
 # Uncomment the following line to try the Direct2D backend.
 # set(USE_DIRECT2D 1)
 
index 3bba225..a6be327 100644 (file)
@@ -5,6 +5,7 @@ include(OptionsWin)
 find_package(Cairo 1.14.4 REQUIRED)
 find_package(CURL 7.45.0 REQUIRED)
 find_package(OpenSSL REQUIRED)
+find_package(Sqlite REQUIRED)
 
 SET_AND_EXPOSE_TO_BUILD(USE_CAIRO ON)
 
index 72b8344..3520c2d 100644 (file)
@@ -1,3 +1,12 @@
+2017-08-24  Don Olmstead  <don.olmstead@sony.com>
+
+        [CMake] Use find_package for SQLite
+        https://bugs.webkit.org/show_bug.cgi?id=175803
+
+        Reviewed by Konstantin Tokarev.
+
+        * TestWebKitAPI/PlatformWin.cmake:
+
 2017-08-23  Jonathan Bedard  <jbedard@apple.com>
 
         Leaking CARenderServerBuffer in PlatformWebView::windowSnapshotImage()
index a79aa6d..1e0ff55 100644 (file)
@@ -90,7 +90,6 @@ else ()
         CoreGraphics${DEBUG_SUFFIX}
         CoreText${DEBUG_SUFFIX}
         QuartzCore${DEBUG_SUFFIX}
-        SQLite3${DEBUG_SUFFIX}
         WebKitSystemInterface${DEBUG_SUFFIX}
         WebKitQuartzCoreAdditions${DEBUG_SUFFIX}
         libdispatch${DEBUG_SUFFIX}