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/Ui/skinned/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/Ui/skinned/CMakeLists.txt')
| -rw-r--r-- | src/plugins/Ui/skinned/CMakeLists.txt | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/src/plugins/Ui/skinned/CMakeLists.txt b/src/plugins/Ui/skinned/CMakeLists.txt index 23ff393a3..68a15b9ce 100644 --- a/src/plugins/Ui/skinned/CMakeLists.txt +++ b/src/plugins/Ui/skinned/CMakeLists.txt @@ -1,21 +1,5 @@ project(skinned) -# 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) @@ -93,7 +77,7 @@ SET(skinned_HDRS SET(skinned_RCCS glare/glare.qrc resources/resources.qrc translations/translations.qrc) -QT4_ADD_RESOURCES(skinned_RCC_SRCS ${skinned_RCCS}) +QT5_ADD_RESOURCES(skinned_RCC_SRCS ${skinned_RCCS}) # user interface @@ -106,14 +90,14 @@ SET(skinned_UIS forms/hotkeyeditor.ui ) -QT4_WRAP_UI(skinned_UIS_H ${skinned_UIS}) +QT5_WRAP_UI(skinned_UIS_H ${skinned_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(X11_FOUND) ADD_LIBRARY(skinned MODULE ${skinned_SRCS} ${skinned_UIS_H} ${skinned_RCC_SRCS} ${skinned_HDRS}) -target_link_libraries(skinned ${QT_LIBRARIES} libqmmp qmmpui ${X11_LDFLAGS}) add_dependencies(skinned qmmpui libqmmp) +target_link_libraries(skinned Qt5::Widgets Qt5::X11Extras -lqmmpui -lqmmp ${X11_LDFLAGS}) install(TARGETS skinned DESTINATION ${LIB_DIR}/qmmp/Ui) ENDIF(X11_FOUND) |