diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
| commit | 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a (patch) | |
| tree | 15d339b62e98d5858a57aa787334e14f0e2f0ad7 /src/plugins/General/notifier/CMakeLists.txt | |
| parent | 6fc05db7c6de9a51beba754f12ff4ac32859977d (diff) | |
| download | qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.gz qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.bz2 qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.zip | |
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
Diffstat (limited to 'src/plugins/General/notifier/CMakeLists.txt')
| -rw-r--r-- | src/plugins/General/notifier/CMakeLists.txt | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/src/plugins/General/notifier/CMakeLists.txt b/src/plugins/General/notifier/CMakeLists.txt index ae11cd7c0..0b2df2839 100644 --- a/src/plugins/General/notifier/CMakeLists.txt +++ b/src/plugins/General/notifier/CMakeLists.txt @@ -1,20 +1,7 @@ project(libnotifier) -# 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}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -27,11 +14,11 @@ SET(libnotifier_SRCS popupwidget.cpp ) -SET(libnotifier_RCCS +SET(libnotifier_RCCS translations/translations.qrc notifier_images.qrc) -QT4_ADD_RESOURCES(libnotifier_RCC_SRCS ${libnotifier_RCCS}) +QT5_ADD_RESOURCES(libnotifier_RCC_SRCS ${libnotifier_RCCS}) # user interface @@ -40,20 +27,20 @@ SET(libnotifier_UIS settingsdialog.ui ) -QT4_WRAP_UI(libnotifier_UIS_H ${libnotifier_UIS}) +QT5_WRAP_UI(libnotifier_UIS_H ${libnotifier_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(notifier MODULE ${libnotifier_SRCS} ${libnotifier_UIS_H} ${libnotifier_RCC_SRCS}) add_dependencies(notifier qmmpui) -IF(X11_FOUND) +IF(X11_FOUND AND Qt5X11Extras_FOUND) include_directories(${X11_INCLUDE_DIRS}) link_directories(${X11_LIBRARY_DIRS}) ADD_DEFINITIONS(${X11_CFLAGS}) ADD_DEFINITIONS(-DX11_FOUND) - target_link_libraries(notifier ${QT_LIBRARIES} qmmpui libqmmp ${X11_LDFLAGS}) -ELSE(X11_FOUND) - target_link_libraries(notifier ${QT_LIBRARIES} qmmpui libqmmp) -ENDIF(X11_FOUND) + target_link_libraries(notifier Qt5::X11Extras Qt5::Widgets ${X11_LDFLAGS} -lqmmpui -lqmmp) +ELSE(X11_FOUND AND Qt5X11Extras_FOUND) + target_link_libraries(notifier Qt5::Widgets -lqmmpui -lqmmp) +ENDIF(X11_FOUND AND Qt5X11Extras_FOUND) install(TARGETS notifier DESTINATION ${LIB_DIR}/qmmp/General) |