diff --git a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt index 01066cc202..bf0f71f075 100644 --- a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt +++ b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt @@ -1,44 +1,44 @@ ########### mysql ############### set( amarok_collection-mysqlcollection_PART_SRCS MySqlCollectionFactory.cpp MySqlQueryMaker.cpp ) add_library(amarok_collection-mysqlcollection MODULE ${amarok_collection-mysqlcollection_PART_SRCS}) string(REPLACE "-Wl,--fatal-warnings" "" CMAKE_SHARED_LINKER_FLAGS_NOFATALWARN "${CMAKE_SHARED_LINKER_FLAGS}") set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS_NOFATALWARN} ) string(REPLACE "-Wl,--fatal-warnings" "" CMAKE_MODULE_LINKER_FLAGS_NOFATALWARN "${CMAKE_MODULE_LINKER_FLAGS}") set(CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS_NOFATALWARN} ) target_link_libraries(amarok_collection-mysqlcollection amarok-sqlcollection amarokcore amaroklib KF5::KDELibs4Support Qt5::Core Qt5::Gui ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES} ) if(WITH_MYSQL_EMBEDDED) target_link_libraries( amarok_collection-mysqlcollection ${MYSQL_EMBEDDED_LIBRARIES} ) endif(WITH_MYSQL_EMBEDDED) if(NOT WIN32 AND NOT APPLE) target_link_libraries( amarok_collection-mysqlcollection crypt pthread ) endif() if(APPLE) SET_TARGET_PROPERTIES(amarok_collection-mysqlcollection PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") endif() install(TARGETS amarok_collection-mysqlcollection DESTINATION ${PLUGIN_INSTALL_DIR} ) install(FILES amarok_collection-mysqlcollection.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -kcoreaddons_desktop_to_json(amarok_collection-mysqlcollection amarok_collection-mysqlcollection.desktop) +kcoreaddons_desktop_to_json(amarok_collection-mysqlcollection amarok_collection-mysqlcollection.desktop SERVICE_TYPES ${CMAKE_SOURCE_DIR}/src/amarok-plugin.desktop) diff --git a/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt b/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt index ba61cc37ec..3cb3b1a41c 100644 --- a/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt +++ b/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt @@ -1,43 +1,43 @@ add_definitions(${MYSQL_EMBEDDED_CFLAGS}) ########### mysqle ############### set( amarok_storage-mysqlestorage_PART_SRCS ../mysql-shared/MySqlStorage.cpp MySqlEmbeddedStorage.cpp MySqlEmbeddedStorageFactory.cpp ) add_library(amarok_storage-mysqlestorage MODULE ${amarok_storage-mysqlestorage_PART_SRCS}) string(REPLACE "-Wl,--fatal-warnings" "" CMAKE_SHARED_LINKER_FLAGS_NOFATALWARN "${CMAKE_SHARED_LINKER_FLAGS}") set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS_NOFATALWARN} ) string(REPLACE "-Wl,--fatal-warnings" "" CMAKE_MODULE_LINKER_FLAGS_NOFATALWARN "${CMAKE_MODULE_LINKER_FLAGS}") set(CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS_NOFATALWARN} ) target_link_libraries(amarok_storage-mysqlestorage # amarok-sqlstorage amarokcore amaroklib KF5::KDELibs4Support Qt5::Core Qt5::Gui ${MYSQL_EMBEDDED_LIBRARIES} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES} ) if(NOT WIN32 AND NOT APPLE) target_link_libraries( amarok_storage-mysqlestorage crypt pthread ) endif() if(APPLE) SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") endif() install(TARGETS amarok_storage-mysqlestorage DESTINATION ${PLUGIN_INSTALL_DIR} ) install(FILES amarok_storage-mysqlestorage.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -kcoreaddons_desktop_to_json(amarok_storage-mysqlestorage amarok_storage-mysqlestorage.desktop) +kcoreaddons_desktop_to_json(amarok_storage-mysqlestorage amarok_storage-mysqlestorage.desktop SERVICE_TYPES ${CMAKE_SOURCE_DIR}/src/amarok-plugin.desktop) diff --git a/src/core-impl/storage/sql/mysqlserverstorage/CMakeLists.txt b/src/core-impl/storage/sql/mysqlserverstorage/CMakeLists.txt index 316a76323d..f8a51261b4 100644 --- a/src/core-impl/storage/sql/mysqlserverstorage/CMakeLists.txt +++ b/src/core-impl/storage/sql/mysqlserverstorage/CMakeLists.txt @@ -1,43 +1,43 @@ add_definitions(${MYSQL_CFLAGS}) ########### mysqlserver ############### set( amarok_storage-mysqlserverstorage_PART_SRCS ../mysql-shared/MySqlStorage.cpp MySqlServerStorage.cpp MySqlServerStorageFactory.cpp ) add_library(amarok_storage-mysqlserverstorage MODULE ${amarok_storage-mysqlserverstorage_PART_SRCS}) string(REPLACE "-Wl,--fatal-warnings" "" CMAKE_SHARED_LINKER_FLAGS_NOFATALWARN "${CMAKE_SHARED_LINKER_FLAGS}") set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS_NOFATALWARN} ) string(REPLACE "-Wl,--fatal-warnings" "" CMAKE_MODULE_LINKER_FLAGS_NOFATALWARN "${CMAKE_MODULE_LINKER_FLAGS}") set(CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS_NOFATALWARN} ) target_link_libraries(amarok_storage-mysqlserverstorage # amarok-sqlstorage amarokcore amaroklib KF5::KDELibs4Support Qt5::Core Qt5::Gui ${MYSQL_LIBRARIES} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES} ) if(NOT WIN32 AND NOT APPLE) target_link_libraries( amarok_storage-mysqlserverstorage crypt pthread ) endif() if(APPLE) SET_TARGET_PROPERTIES(amarok_storage-mysqlserverstorage PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") endif() install(TARGETS amarok_storage-mysqlserverstorage DESTINATION ${PLUGIN_INSTALL_DIR} ) install(FILES amarok_storage-mysqlserverstorage.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -kcoreaddons_desktop_to_json(amarok_storage-mysqlserverstorage amarok_storage-mysqlserverstorage.desktop) +kcoreaddons_desktop_to_json(amarok_storage-mysqlserverstorage amarok_storage-mysqlserverstorage.desktop SERVICE_TYPES ${CMAKE_SOURCE_DIR}/src/amarok-plugin.desktop)