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/Input/opus/CMakeLists.txt | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'src/plugins/Input/opus/CMakeLists.txt') diff --git a/src/plugins/Input/opus/CMakeLists.txt b/src/plugins/Input/opus/CMakeLists.txt index b6f5f1219..f443ef901 100644 --- a/src/plugins/Input/opus/CMakeLists.txt +++ b/src/plugins/Input/opus/CMakeLists.txt @@ -1,20 +1,7 @@ project(libopus) -# 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}/../../../ -) - # libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) @@ -31,26 +18,20 @@ SET(libopus_SRCS decoderopusfactory.cpp opusmetadatamodel.cpp replaygainreader.cpp - opusfile.cpp - opusproperties.cpp - tdebug.cpp ) SET(libopus_HDRS decoder_opus.h replaygainreader.h - opusfile.h - opusproperties.h - tdebug.h ) SET(libopus_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libopus_RCC_SRCS ${libopus_RCCS}) +QT5_ADD_RESOURCES(libopus_RCC_SRCS ${libopus_RCCS}) # user interface -QT4_WRAP_UI(libopus_UIS_H ${libopus_UIS}) +QT5_WRAP_UI(libopus_UIS_H ${libopus_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -58,6 +39,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(OPUS_FOUND) ADD_LIBRARY(opus MODULE ${libopus_SRCS} ${libopus_RCC_SRCS} ${libopus_HDRS}) add_dependencies(opus qmmp) -target_link_libraries(opus ${QT_LIBRARIES} libqmmp ${OPUS_LDFLAGS} ${TAGLIB_LDFLAGS}) +target_link_libraries(opus Qt5::Widgets -lqmmp ${OPUS_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS opus DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(OPUS_FOUND) -- cgit v1.2.3-13-gbd6f