D28284: Add FindMariaDB.cmake module and use it if MySQL is not found
Andreas Sturmlechner
noreply at phabricator.kde.org
Wed Mar 25 15:43:54 GMT 2020
asturmlechner created this revision.
asturmlechner added reviewers: Amarok, heikobecker, wbauer.
Herald added a project: Amarok.
Herald added a subscriber: amarok-devel.
asturmlechner requested review of this revision.
REVISION SUMMARY
- Previously, MariaDB lib was only found w/ distro provided compat links
- In fact both MySQL and MariaDB client libs can be installed side by side
FindMySQL.cmake: Split out MySQL Embedded detection into FindMySQLe.cmake
- MySQLe is pretty much dead now
- If MySQLe is not found, we will not attempt to link MYSQLE_LIBRARIES anymore
- Move ZLIB detection behind MySQLe conditional
- WITH_MYSQL_EMBEDDED is now obsolete
- Drop superfluous set_package_properties if defined in Find*.cmake module
Drop superfluous ZLIB linking
- Amarok builds fine without, according to CMakeLists.txt only required
for MySQLe anyway.
TEST PLAN
Built fine against mysql-connector-c as well as mariadb-connector-c.
Unfortunately, MySQLe is long gone in Gentoo so I rely on sb. else's test.
REPOSITORY
R181 Amarok
BRANCH
mysqle-split-for-phab
REVISION DETAIL
https://phabricator.kde.org/D28284
AFFECTED FILES
CMakeLists.txt
cmake/modules/FindMariaDB.cmake
cmake/modules/FindMySQL.cmake
cmake/modules/FindMySQLe.cmake
src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
src/core-impl/storage/sql/CMakeLists.txt
src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt
src/core-impl/storage/sql/mysqlserverstorage/CMakeLists.txt
tests/core-impl/collections/db/sql/CMakeLists.txt
tests/dynamic/CMakeLists.txt
tests/scanner/CMakeLists.txt
To: asturmlechner, #amarok, heikobecker, wbauer
Cc: amarok-devel, vmatare, jfowkes, pgomes, nicolamori, jyasi, mfraser, ryanmccoskrie, semareit, eridani, eoinoneill, jackyalcine, nhuisman, paul, domson, yaohanchen, malteveerman, markey, James, tbettler, Smar, ricktimmis, asturmlechner, schweingruber, heikobecker
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/amarok-devel/attachments/20200325/d938c9da/attachment.html>
More information about the Amarok-devel
mailing list