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/aac/CMakeLists.txt | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'src/plugins/Input/aac/CMakeLists.txt') diff --git a/src/plugins/Input/aac/CMakeLists.txt b/src/plugins/Input/aac/CMakeLists.txt index 5e75c3604..c6f2fd063 100644 --- a/src/plugins/Input/aac/CMakeLists.txt +++ b/src/plugins/Input/aac/CMakeLists.txt @@ -3,21 +3,8 @@ project(libaac) INCLUDE(CheckCXXSourceCompiles) INCLUDE(CheckIncludeFileCXX) -# 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) @@ -71,7 +58,7 @@ SET(libaac_HDRS SET(libaac_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libaac_RCC_SRCS ${libaac_RCCS}) +QT5_ADD_RESOURCES(libaac_RCC_SRCS ${libaac_RCCS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! @@ -80,6 +67,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(FAAD_FOUND) ADD_LIBRARY(aac MODULE ${libaac_SRCS} ${libaac_RCC_SRCS} ${libaac_HDRS}) add_dependencies(aac qmmp) -target_link_libraries(aac ${QT_LIBRARIES} libqmmp -lfaad ${TAGLIB_LDFLAGS}) +target_link_libraries(aac Qt5::Widgets -lqmmp -lfaad ${TAGLIB_LDFLAGS}) install(TARGETS aac DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(FAAD_FOUND) -- cgit v1.2.3-13-gbd6f