Diff
Modified: trunk/ChangeLog (255474 => 255475)
--- trunk/ChangeLog 2020-01-31 00:48:16 UTC (rev 255474)
+++ trunk/ChangeLog 2020-01-31 00:51:59 UTC (rev 255475)
@@ -1,3 +1,19 @@
+2020-01-30 Ross Kirsling <[email protected]>
+
+ [CMake] Add SQLite::SQLite3 target
+ https://bugs.webkit.org/show_bug.cgi?id=207005
+
+ Reviewed by Don Olmstead.
+
+ * Source/cmake/FindSQLite3.cmake: Added.
+ * Source/cmake/FindSqlite.cmake: Removed.
+ * Source/cmake/OptionsAppleWin.cmake: Actually use find_package.
+ * Source/cmake/OptionsFTW.cmake: Sqlite -> SQLite3
+ * Source/cmake/OptionsGTK.cmake: Sqlite -> SQLite3
+ * Source/cmake/OptionsPlayStation.cmake: Sqlite -> SQLite3
+ * Source/cmake/OptionsWPE.cmake: Sqlite -> SQLite3
+ * Source/cmake/OptionsWinCairo.cmake: Sqlite -> SQLite3
+
2020-01-29 Fujii Hironori <[email protected]>
[MSVC] Add /experimental:newLambdaProcessor switch for better C++ conformance
Modified: trunk/Source/WebCore/CMakeLists.txt (255474 => 255475)
--- trunk/Source/WebCore/CMakeLists.txt 2020-01-31 00:48:16 UTC (rev 255474)
+++ trunk/Source/WebCore/CMakeLists.txt 2020-01-31 00:51:59 UTC (rev 255475)
@@ -175,7 +175,6 @@
set(WebCore_SYSTEM_INCLUDE_DIRECTORIES
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIR}
- ${SQLITE_INCLUDE_DIR}
${ZLIB_INCLUDE_DIRS}
)
@@ -1221,9 +1220,9 @@
)
set(WebCore_LIBRARIES
+ SQLite::SQLite3
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
- ${SQLITE_LIBRARIES}
${ZLIB_LIBRARIES}
PAL${DEBUG_SUFFIX}
)
Modified: trunk/Source/WebCore/ChangeLog (255474 => 255475)
--- trunk/Source/WebCore/ChangeLog 2020-01-31 00:48:16 UTC (rev 255474)
+++ trunk/Source/WebCore/ChangeLog 2020-01-31 00:51:59 UTC (rev 255475)
@@ -1,3 +1,13 @@
+2020-01-30 Ross Kirsling <[email protected]>
+
+ [CMake] Add SQLite::SQLite3 target
+ https://bugs.webkit.org/show_bug.cgi?id=207005
+
+ Reviewed by Don Olmstead.
+
+ * CMakeLists.txt: Use SQLite3 target.
+ * PlatformPlayStation.cmake: Remove redundant entries.
+
2020-01-30 Tim Horton <[email protected]>
Add a quirk to opt Twitter out of the non-overlaid minimized input view
Modified: trunk/Source/WebCore/PlatformPlayStation.cmake (255474 => 255475)
--- trunk/Source/WebCore/PlatformPlayStation.cmake 2020-01-31 00:48:16 UTC (rev 255474)
+++ trunk/Source/WebCore/PlatformPlayStation.cmake 2020-01-31 00:51:59 UTC (rev 255475)
@@ -84,15 +84,9 @@
)
list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
- ${LIBXML2_INCLUDE_DIR}
- ${SQLITE_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIRS}
${WPE_INCLUDE_DIRS}
)
list(APPEND WebCore_LIBRARIES
- ${LIBXML2_LIBRARIES}
- ${SQLITE_LIBRARIES}
- ${ZLIB_LIBRARIES}
${WPE_LIBRARIES}
)
Added: trunk/Source/cmake/FindSQLite3.cmake (0 => 255475)
--- trunk/Source/cmake/FindSQLite3.cmake (rev 0)
+++ trunk/Source/cmake/FindSQLite3.cmake 2020-01-31 00:51:59 UTC (rev 255475)
@@ -0,0 +1,104 @@
+# Copyright (C) 2020 Sony Interactive Entertainment Inc.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#[=======================================================================[.rst:
+FindSQLite3
+--------------
+
+Find SQLite3 headers and libraries.
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+``SQLite::SQLite3``
+ The SQLite3 library, if found.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This will define the following variables in your project:
+
+``SQLite3_FOUND``
+ true if (the requested version of) SQLite3 is available.
+``SQLite3_VERSION``
+ the version of SQLite3.
+``SQLite3_LIBRARIES``
+ the libraries to link against to use SQLite3.
+``SQLite3_INCLUDE_DIRS``
+ where to find the SQLite3 headers.
+``SQLite3_COMPILE_OPTIONS``
+ this should be passed to target_compile_options(), if the
+ target is not used for linking
+
+#]=======================================================================]
+
+# TODO: Remove when cmake_minimum_version bumped to 3.14.
+
+include(FindPkgConfig)
+pkg_check_modules(PC_SQLITE3 QUIET sqlite3)
+set(SQLite3_COMPILE_OPTIONS ${PC_SQLITE3_CFLAGS_OTHER})
+set(SQLite3_VERSION ${PC_SQLITE3_VERSION})
+
+find_path(SQLite3_INCLUDE_DIR
+ NAMES sqlite3.h
+ HINTS ${PC_SQLITE3_INCLUDEDIR} ${PC_SQLITE3_INCLUDE_DIR}
+)
+
+find_library(SQLite3_LIBRARY
+ NAMES ${SQLite3_NAMES} sqlite3
+ HINTS ${PC_SQLITE3_LIBDIR} ${PC_SQLITE3_LIBRARY_DIRS}
+)
+
+if (SQLite3_INCLUDE_DIR AND NOT SQLite3_VERSION)
+ if (EXISTS "${SQLite3_INCLUDE_DIR}/sqlite3.h")
+ file(STRINGS ${SQLite3_INCLUDE_DIR}/sqlite3.h _ver_line
+ REGEX "^#define SQLITE_VERSION *\"[0-9]+\\.[0-9]+\\.[0-9]+\""
+ LIMIT_COUNT 1)
+ string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+"
+ SQLite3_VERSION "${_ver_line}")
+ unset(_ver_line)
+ endif ()
+endif ()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SQLite3
+ FOUND_VAR SQLite3_FOUND
+ REQUIRED_VARS SQLite3_LIBRARY SQLite3_INCLUDE_DIR
+ VERSION_VAR SQLite3_VERSION
+)
+
+if (SQLite3_LIBRARY AND NOT TARGET SQLite::SQLite3)
+ add_library(SQLite::SQLite3 UNKNOWN IMPORTED GLOBAL)
+ set_target_properties(SQLite::SQLite3 PROPERTIES
+ IMPORTED_LOCATION "${SQLite3_LIBRARY}"
+ INTERFACE_COMPILE_OPTIONS "${SQLite3_COMPILE_OPTIONS}"
+ INTERFACE_INCLUDE_DIRECTORIES "${SQLite3_INCLUDE_DIR}"
+ )
+endif ()
+
+mark_as_advanced(SQLite3_INCLUDE_DIR SQLite3_LIBRARIES)
+
+if (SQLite3_FOUND)
+ set(SQLite3_LIBRARIES ${SQLite3_LIBRARY})
+ set(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDE_DIR})
+endif ()
Deleted: trunk/Source/cmake/FindSqlite.cmake (255474 => 255475)
--- trunk/Source/cmake/FindSqlite.cmake 2020-01-31 00:48:16 UTC (rev 255474)
+++ trunk/Source/cmake/FindSqlite.cmake 2020-01-31 00:51:59 UTC (rev 255475)
@@ -1,61 +0,0 @@
-# - Try to find Sqlite
-# Once done this will define
-#
-# SQLITE_FOUND - system has Sqlite
-# SQLITE_INCLUDE_DIR - the Sqlite include directory
-# SQLITE_LIBRARIES - Link these to use Sqlite
-# SQLITE_DEFINITIONS - Compiler switches required for using Sqlite
-#
-# Copyright (c) 2008, Gilles Caulier, <[email protected]>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-# derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-if (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
- # in cache already
- set(Sqlite_FIND_QUIETLY TRUE)
-endif (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
-
-# use pkg-config to get the directories and then use these values
-# in the find_path() and find_library() calls
-if (NOT WIN32)
- find_package(PkgConfig)
-
- pkg_check_modules(PC_SQLITE sqlite3)
-
- set(SQLITE_DEFINITIONS ${PC_SQLITE_CFLAGS_OTHER})
-endif (NOT WIN32)
-
-find_path(SQLITE_INCLUDE_DIR NAMES sqlite3.h
- HINTS ${PC_SQLITE_INCLUDEDIR} ${PC_SQLITE_INCLUDE_DIRS}
-)
-
-find_library(SQLITE_LIBRARIES NAMES sqlite3
- HINTS ${PC_SQLITE_LIBDIR} ${PC_SQLITE_LIBRARY_DIRS}
-)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sqlite DEFAULT_MSG SQLITE_INCLUDE_DIR SQLITE_LIBRARIES)
-
-# show the SQLITE_INCLUDE_DIR and SQLITE_LIBRARIES variables only in the advanced view
-mark_as_advanced(SQLITE_INCLUDE_DIR SQLITE_LIBRARIES)
Modified: trunk/Source/cmake/OptionsAppleWin.cmake (255474 => 255475)
--- trunk/Source/cmake/OptionsAppleWin.cmake 2020-01-31 00:48:16 UTC (rev 255474)
+++ trunk/Source/cmake/OptionsAppleWin.cmake 2020-01-31 00:51:59 UTC (rev 255475)
@@ -9,11 +9,13 @@
SET_AND_EXPOSE_TO_BUILD(USE_CF ON)
SET_AND_EXPOSE_TO_BUILD(USE_CFURLCONNECTION ON)
+set(SQLite3_NAMES SQLite3${DEBUG_SUFFIX})
+find_package(SQLite3 REQUIRED)
+
# Libraries where find_package does not work
set(COREFOUNDATION_LIBRARY CoreFoundation${DEBUG_SUFFIX})
set(LIBXML2_LIBRARIES libxml2${DEBUG_SUFFIX})
set(LIBXSLT_LIBRARIES libxslt${DEBUG_SUFFIX})
-set(SQLITE_LIBRARIES SQLite3${DEBUG_SUFFIX})
set(ZLIB_INCLUDE_DIRS "${WEBKIT_LIBRARIES_DIR}/include/zlib")
set(ZLIB_LIBRARIES zdll${DEBUG_SUFFIX})
Modified: trunk/Source/cmake/OptionsFTW.cmake (255474 => 255475)
--- trunk/Source/cmake/OptionsFTW.cmake 2020-01-31 00:48:16 UTC (rev 255474)
+++ trunk/Source/cmake/OptionsFTW.cmake 2020-01-31 00:51:59 UTC (rev 255475)
@@ -229,7 +229,7 @@
find_package(JPEG 1.5.2 REQUIRED)
find_package(OpenSSL 2.0.0 REQUIRED)
find_package(PNG 1.6.34 REQUIRED)
-find_package(Sqlite 3.23.1 REQUIRED)
+find_package(SQLite3 3.23.1 REQUIRED)
find_package(ZLIB 1.2.11 REQUIRED)
find_package(LibPSL 0.20.2 REQUIRED)
Modified: trunk/Source/cmake/OptionsGTK.cmake (255474 => 255475)
--- trunk/Source/cmake/OptionsGTK.cmake 2020-01-31 00:48:16 UTC (rev 255474)
+++ trunk/Source/cmake/OptionsGTK.cmake 2020-01-31 00:51:59 UTC (rev 255475)
@@ -30,7 +30,7 @@
find_package(LibSoup 2.54.0 REQUIRED)
find_package(LibXml2 2.8.0 REQUIRED)
find_package(PNG REQUIRED)
-find_package(Sqlite REQUIRED)
+find_package(SQLite3 REQUIRED)
find_package(Threads REQUIRED)
find_package(ZLIB REQUIRED)
find_package(ATK 2.16.0 REQUIRED)
Modified: trunk/Source/cmake/OptionsPlayStation.cmake (255474 => 255475)
--- trunk/Source/cmake/OptionsPlayStation.cmake 2020-01-31 00:48:16 UTC (rev 255474)
+++ trunk/Source/cmake/OptionsPlayStation.cmake 2020-01-31 00:51:59 UTC (rev 255475)
@@ -105,7 +105,7 @@
find_package(OpenSSL REQUIRED)
find_package(Pixman REQUIRED)
find_package(PNG REQUIRED)
-find_package(Sqlite REQUIRED)
+find_package(SQLite3 REQUIRED)
find_package(Threads REQUIRED)
find_package(WebP REQUIRED)
find_package(WPE REQUIRED)
Modified: trunk/Source/cmake/OptionsWPE.cmake (255474 => 255475)
--- trunk/Source/cmake/OptionsWPE.cmake 2020-01-31 00:48:16 UTC (rev 255474)
+++ trunk/Source/cmake/OptionsWPE.cmake 2020-01-31 00:51:59 UTC (rev 255475)
@@ -24,7 +24,7 @@
find_package(LibSoup 2.54.0 REQUIRED)
find_package(LibXml2 2.8.0 REQUIRED)
find_package(PNG REQUIRED)
-find_package(Sqlite REQUIRED)
+find_package(SQLite3 REQUIRED)
find_package(Threads REQUIRED)
find_package(WebP REQUIRED)
find_package(WPE REQUIRED)
Modified: trunk/Source/cmake/OptionsWinCairo.cmake (255474 => 255475)
--- trunk/Source/cmake/OptionsWinCairo.cmake 2020-01-31 00:48:16 UTC (rev 255474)
+++ trunk/Source/cmake/OptionsWinCairo.cmake 2020-01-31 00:51:59 UTC (rev 255475)
@@ -12,7 +12,7 @@
find_package(LibXml2 2.9.7 REQUIRED)
find_package(OpenSSL 2.0.0 REQUIRED)
find_package(PNG 1.6.34 REQUIRED)
-find_package(Sqlite 3.23.1 REQUIRED)
+find_package(SQLite3 3.23.1 REQUIRED)
find_package(ZLIB 1.2.11 REQUIRED)
find_package(LibPSL 0.20.2 REQUIRED)
