⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 255475 in webkit


Ignore:
Timestamp:
Jan 30, 2020, 4:51:59 PM (7 years ago)
Author:
Ross Kirsling
Message:

[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

Source/WebCore:

  • CMakeLists.txt: Use SQLite3 target.
  • PlatformPlayStation.cmake: Remove redundant entries.
Location:
trunk
Files:
1 added
1 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r255418 r255475  
     12020-01-30  Ross Kirsling  <ross.kirsling@sony.com>
     2
     3        [CMake] Add SQLite::SQLite3 target
     4        https://bugs.webkit.org/show_bug.cgi?id=207005
     5
     6        Reviewed by Don Olmstead.
     7
     8        * Source/cmake/FindSQLite3.cmake: Added.
     9        * Source/cmake/FindSqlite.cmake: Removed.
     10        * Source/cmake/OptionsAppleWin.cmake: Actually use find_package.
     11        * Source/cmake/OptionsFTW.cmake: Sqlite -> SQLite3
     12        * Source/cmake/OptionsGTK.cmake: Sqlite -> SQLite3
     13        * Source/cmake/OptionsPlayStation.cmake: Sqlite -> SQLite3
     14        * Source/cmake/OptionsWPE.cmake: Sqlite -> SQLite3
     15        * Source/cmake/OptionsWinCairo.cmake: Sqlite -> SQLite3
     16
    1172020-01-29  Fujii Hironori  <Hironori.Fujii@sony.com>
    218

  • trunk/Source/WebCore/CMakeLists.txt

    r255406 r255475  
    176176    ${LIBXML2_INCLUDE_DIR}
    177177    ${LIBXSLT_INCLUDE_DIR}
    178     ${SQLITE_INCLUDE_DIR}
    179178    ${ZLIB_INCLUDE_DIRS}
    180179)
    … …  
    12221221
    12231222set(WebCore_LIBRARIES
     1223    SQLite::SQLite3
    12241224    ${LIBXML2_LIBRARIES}
    12251225    ${LIBXSLT_LIBRARIES}
    1226     ${SQLITE_LIBRARIES}
    12271226    ${ZLIB_LIBRARIES}
    12281227    PAL${DEBUG_SUFFIX}

  • trunk/Source/WebCore/ChangeLog

    r255469 r255475  
     12020-01-30  Ross Kirsling  <ross.kirsling@sony.com>
     2
     3        [CMake] Add SQLite::SQLite3 target
     4        https://bugs.webkit.org/show_bug.cgi?id=207005
     5
     6        Reviewed by Don Olmstead.
     7
     8        * CMakeLists.txt: Use SQLite3 target.
     9        * PlatformPlayStation.cmake: Remove redundant entries.
     10
    1112020-01-30  Tim Horton  <timothy_horton@apple.com>
    212

  • trunk/Source/WebCore/PlatformPlayStation.cmake

    r254958 r255475  
    8585
    8686list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
    87     ${LIBXML2_INCLUDE_DIR}
    88     ${SQLITE_INCLUDE_DIR}
    89     ${ZLIB_INCLUDE_DIRS}
    9087    ${WPE_INCLUDE_DIRS}
    9188)
    9289
    9390list(APPEND WebCore_LIBRARIES
    94     ${LIBXML2_LIBRARIES}
    95     ${SQLITE_LIBRARIES}
    96     ${ZLIB_LIBRARIES}
    9791    ${WPE_LIBRARIES}
    9892)

  • trunk/Source/cmake/OptionsAppleWin.cmake

    r245492 r255475  
    1010SET_AND_EXPOSE_TO_BUILD(USE_CFURLCONNECTION ON)
    1111
     12set(SQLite3_NAMES SQLite3${DEBUG_SUFFIX})
     13find_package(SQLite3 REQUIRED)
     14
    1215# Libraries where find_package does not work
    1316set(COREFOUNDATION_LIBRARY CoreFoundation${DEBUG_SUFFIX})
    1417set(LIBXML2_LIBRARIES libxml2${DEBUG_SUFFIX})
    1518set(LIBXSLT_LIBRARIES libxslt${DEBUG_SUFFIX})
    16 set(SQLITE_LIBRARIES SQLite3${DEBUG_SUFFIX})
    1719set(ZLIB_INCLUDE_DIRS "${WEBKIT_LIBRARIES_DIR}/include/zlib")
    1820set(ZLIB_LIBRARIES zdll${DEBUG_SUFFIX})

  • trunk/Source/cmake/OptionsFTW.cmake

    r254958 r255475  
    230230find_package(OpenSSL 2.0.0 REQUIRED)
    231231find_package(PNG 1.6.34 REQUIRED)
    232 find_package(Sqlite 3.23.1 REQUIRED)
     232find_package(SQLite3 3.23.1 REQUIRED)
    233233find_package(ZLIB 1.2.11 REQUIRED)
    234234find_package(LibPSL 0.20.2 REQUIRED)

  • trunk/Source/cmake/OptionsGTK.cmake

    r255342 r255475  
    3131find_package(LibXml2 2.8.0 REQUIRED)
    3232find_package(PNG REQUIRED)
    33 find_package(Sqlite REQUIRED)
     33find_package(SQLite3 REQUIRED)
    3434find_package(Threads REQUIRED)
    3535find_package(ZLIB REQUIRED)

  • trunk/Source/cmake/OptionsPlayStation.cmake

    r255392 r255475  
    106106find_package(Pixman REQUIRED)
    107107find_package(PNG REQUIRED)
    108 find_package(Sqlite REQUIRED)
     108find_package(SQLite3 REQUIRED)
    109109find_package(Threads REQUIRED)
    110110find_package(WebP REQUIRED)

  • trunk/Source/cmake/OptionsWPE.cmake

    r255241 r255475  
    2525find_package(LibXml2 2.8.0 REQUIRED)
    2626find_package(PNG REQUIRED)
    27 find_package(Sqlite REQUIRED)
     27find_package(SQLite3 REQUIRED)
    2828find_package(Threads REQUIRED)
    2929find_package(WebP REQUIRED)

  • trunk/Source/cmake/OptionsWinCairo.cmake

    r254958 r255475  
    1313find_package(OpenSSL 2.0.0 REQUIRED)
    1414find_package(PNG 1.6.34 REQUIRED)
    15 find_package(Sqlite 3.23.1 REQUIRED)
     15find_package(SQLite3 3.23.1 REQUIRED)
    1616find_package(ZLIB 1.2.11 REQUIRED)
    1717find_package(LibPSL 0.20.2 REQUIRED)
Note: See TracChangeset for help on using the changeset viewer.