diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
| commit | 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a (patch) | |
| tree | 15d339b62e98d5858a57aa787334e14f0e2f0ad7 /src/plugins/Input/archive/CMakeLists.txt | |
| parent | 6fc05db7c6de9a51beba754f12ff4ac32859977d (diff) | |
| download | qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.gz qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.bz2 qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.zip | |
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
Diffstat (limited to 'src/plugins/Input/archive/CMakeLists.txt')
| -rw-r--r-- | src/plugins/Input/archive/CMakeLists.txt | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/plugins/Input/archive/CMakeLists.txt b/src/plugins/Input/archive/CMakeLists.txt index 07c320cd3..bacc8de2f 100644 --- a/src/plugins/Input/archive/CMakeLists.txt +++ b/src/plugins/Input/archive/CMakeLists.txt @@ -1,20 +1,7 @@ project(libarchive) -# 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) @@ -41,13 +28,13 @@ SET(libarchive_HDRS SET(libarchive_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libarchive_RCC_SRCS ${libarchive_RCCS}) +QT5_ADD_RESOURCES(libarchive_RCC_SRCS ${libarchive_RCCS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(LIBARCHIVE_FOUND) ADD_LIBRARY(archive MODULE ${libarchive_SRCS} ${libarchive_RCC_SRCS} ${libarchive_HDRS}) add_dependencies(archive qmmp) -target_link_libraries(archive ${QT_LIBRARIES} libqmmp ${LIBARCHIVE_LDFLAGS} ${TAGLIB_LDFLAGS}) +target_link_libraries(archive Qt5::Widgets libqmmp ${LIBARCHIVE_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS archive DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(LIBARCHIVE_FOUND) |