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/Ui/qsui/CMakeLists.txt | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'src/plugins/Ui/qsui/CMakeLists.txt') diff --git a/src/plugins/Ui/qsui/CMakeLists.txt b/src/plugins/Ui/qsui/CMakeLists.txt index a0a3c9bd7..ab302dda4 100644 --- a/src/plugins/Ui/qsui/CMakeLists.txt +++ b/src/plugins/Ui/qsui/CMakeLists.txt @@ -1,14 +1,4 @@ -project(libqsui) - -# 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_SOURCE_DIR}) +project(qsui) # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) @@ -60,7 +50,7 @@ SET(libqsui_HDRS SET(libqsui_RCCS translations/translations.qrc txt/qsui_txt.qrc resources/qsui_resources.qrc) -QT4_ADD_RESOURCES(libqsui_RCC_SRCS ${libqsui_RCCS}) +QT5_ADD_RESOURCES(libqsui_RCC_SRCS ${libqsui_RCCS}) # user interface @@ -74,12 +64,12 @@ SET(libqsui_UIS forms/hotkeyeditor.ui ) -QT4_WRAP_UI(libqsui_UIS_H ${libqsui_UIS}) +QT5_WRAP_UI(libqsui_UIS_H ${libqsui_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(qsui MODULE ${libqsui_SRCS} ${libqsui_UIS_H} ${libqsui_RCC_SRCS} ${libqsui_HDRS}) add_dependencies(qsui qmmpui libqmmp) -target_link_libraries(qsui ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(qsui Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS qsui DESTINATION ${LIB_DIR}/qmmp/Ui) -- cgit v1.2.3-13-gbd6f