From 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 25 Nov 2017 18:00:06 +0000 Subject: copy 1.2 branch to trunk git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/udisks2/CMakeLists.txt | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'src/plugins/General/udisks2/CMakeLists.txt') diff --git a/src/plugins/General/udisks2/CMakeLists.txt b/src/plugins/General/udisks2/CMakeLists.txt index bb12e48b2..a24c94e5f 100644 --- a/src/plugins/General/udisks2/CMakeLists.txt +++ b/src/plugins/General/udisks2/CMakeLists.txt @@ -1,19 +1,5 @@ project(libudisks2) -SET (QT_USE_QTDBUS TRUE) - -INCLUDE(FindQt4) - -include(${QT_USE_FILE}) - -# qt plugin -ADD_DEFINITIONS( -Wall ) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) # libqmmpui & libqmmp @@ -31,7 +17,7 @@ SET(libudisks2_SRCS SET(libudisks2_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libudisks2_RCC_SRCS ${libudisks2_RCCS}) +QT5_ADD_RESOURCES(libudisks2_RCC_SRCS ${libudisks2_RCCS}) # user interface @@ -39,12 +25,12 @@ SET(libudisks2_UIS settingsdialog.ui ) -QT4_WRAP_UI(libudisks2_UIS_H ${libudisks2_UIS}) +QT5_WRAP_UI(libudisks2_UIS_H ${libudisks2_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(udisks2 MODULE ${libudisks2_SRCS} ${libudisks2_UIS_H} ${libudisks2_RCC_SRCS}) add_dependencies(udisks2 qmmpui) -target_link_libraries(udisks2 ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(udisks2 Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) install(TARGETS udisks2 DESTINATION ${LIB_DIR}/qmmp/General) -- cgit v1.2.3-13-gbd6f