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/hotkey/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/hotkey/CMakeLists.txt')
| -rw-r--r-- | src/plugins/General/hotkey/CMakeLists.txt | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/plugins/General/hotkey/CMakeLists.txt b/src/plugins/General/hotkey/CMakeLists.txt index 9cf51d112..ca8188a31 100644 --- a/src/plugins/General/hotkey/CMakeLists.txt +++ b/src/plugins/General/hotkey/CMakeLists.txt @@ -2,22 +2,8 @@ project(libhotkey) INCLUDE(CheckIncludeFile) -# 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) -ADD_DEFINITIONS(${X11_CFLAGS}) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - include_directories(${X11_INCLUDE_DIRS}) link_directories(${X11_LIBRARY_DIRS}) @@ -45,7 +31,7 @@ SET(libhotkey_RCCS translations/translations.qrc ) -QT4_ADD_RESOURCES(libhotkey_RCC_SRCS ${libhotkey_RCCS}) +QT5_ADD_RESOURCES(libhotkey_RCC_SRCS ${libhotkey_RCCS}) # user interface @@ -55,7 +41,7 @@ SET(libhotkey_UIS hotkeydialog.ui ) -QT4_WRAP_UI(libhotkey_UIS_H ${libhotkey_UIS}) +QT5_WRAP_UI(libhotkey_UIS_H ${libhotkey_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -64,6 +50,6 @@ IF(X11_FOUND) set_property(SOURCE hotkeymanager_x11.cpp PROPERTY SKIP_AUTOMOC ON) ADD_LIBRARY(hotkey MODULE ${libhotkey_SRCS} ${libhotkey_UIS_H} ${libhotkey_RCC_SRCS}) add_dependencies(hotkey qmmpui) -target_link_libraries(hotkey ${QT_LIBRARIES} qmmpui libqmmp ${X11_LDFLAGS}) +target_link_libraries(hotkey Qt5::Widgets Qt5::X11Extras -lqmmpui -lqmmp ${X11_LDFLAGS}) install(TARGETS hotkey DESTINATION ${LIB_DIR}/qmmp/General) ENDIF(X11_FOUND) |