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/streambrowser/CMakeLists.txt | 25 +++--------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'src/plugins/General/streambrowser/CMakeLists.txt') diff --git a/src/plugins/General/streambrowser/CMakeLists.txt b/src/plugins/General/streambrowser/CMakeLists.txt index a63b00e60..064525673 100644 --- a/src/plugins/General/streambrowser/CMakeLists.txt +++ b/src/plugins/General/streambrowser/CMakeLists.txt @@ -1,26 +1,7 @@ project(libstreambrowser) - -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}) -SET(QT_INCLUDES - ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ -) - # libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) @@ -35,7 +16,7 @@ SET(libstreambrowser_SRCS SET(libstreambrowser_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libstreambrowser_RCC_SRCS ${libstreambrowser_RCCS}) +QT5_ADD_RESOURCES(libstreambrowser_RCC_SRCS ${libstreambrowser_RCCS}) # user interface @@ -43,12 +24,12 @@ SET(libstreambrowser_UIS streamwindow.ui ) -QT4_WRAP_UI(libstreambrowser_UIS_H ${libstreambrowser_UIS}) +QT5_WRAP_UI(libstreambrowser_UIS_H ${libstreambrowser_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(streambrowser MODULE ${libstreambrowser_SRCS} ${libstreambrowser_UIS_H} ${libstreambrowser_RCC_SRCS}) add_dependencies(streambrowser qmmpui) -target_link_libraries(streambrowser ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(streambrowser Qt5::Widgets Qt5::Network -lqmmpui -lqmmp) install(TARGETS streambrowser DESTINATION ${LIB_DIR}/qmmp/General) -- cgit v1.2.3-13-gbd6f