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/covermanager/CMakeLists.txt | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'src/plugins/General/covermanager/CMakeLists.txt') diff --git a/src/plugins/General/covermanager/CMakeLists.txt b/src/plugins/General/covermanager/CMakeLists.txt index 10265b03a..54a1d83d3 100644 --- a/src/plugins/General/covermanager/CMakeLists.txt +++ b/src/plugins/General/covermanager/CMakeLists.txt @@ -1,18 +1,5 @@ project(libcovermanager) -SET(QT_USE_QTNETWORK 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}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -33,7 +20,7 @@ SET(libcovermanager_RCCS images/cm_images.qrc ) -QT4_ADD_RESOURCES(libcovermanager_RCC_SRCS ${libcovermanager_RCCS}) +QT5_ADD_RESOURCES(libcovermanager_RCC_SRCS ${libcovermanager_RCCS}) # user interface @@ -41,7 +28,7 @@ QT4_ADD_RESOURCES(libcovermanager_RCC_SRCS ${libcovermanager_RCCS}) SET(libcovermanager_UIS ) -QT4_WRAP_UI(libcovermanager_UIS_H ${libcovermanager_UIS}) +QT5_WRAP_UI(libcovermanager_UIS_H ${libcovermanager_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -49,5 +36,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(covermanager MODULE ${libcovermanager_SRCS} ${libcovermanager_UIS_H} ${libcovermanager_RCC_SRCS}) add_dependencies(covermanager qmmpui) -target_link_libraries(covermanager ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(covermanager Qt5::Widgets -lqmmpui -lqmmp) install(TARGETS covermanager DESTINATION ${LIB_DIR}/qmmp/General) -- cgit v1.2.3-13-gbd6f