diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/Output/qtmultimedia/CMakeLists.txt | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b8b5fcff..6d7501d69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,6 @@ ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") SET(QT_MIN_VERSION 4.6.0) -SET(QT_USE_QTMULTIMEDIA 1) INCLUDE(FindQt4) INCLUDE(${QT_USE_FILE}) INCLUDE(FindPkgConfig) diff --git a/src/plugins/Output/qtmultimedia/CMakeLists.txt b/src/plugins/Output/qtmultimedia/CMakeLists.txt index 686739002..d5352b3c1 100644 --- a/src/plugins/Output/qtmultimedia/CMakeLists.txt +++ b/src/plugins/Output/qtmultimedia/CMakeLists.txt @@ -1,6 +1,10 @@ project(libqtmultimedia) -cmake_minimum_required(VERSION 2.4.7) +cmake_minimum_required(VERSION 2.6.0) + +SET(QT_USE_QTMULTIMEDIA TRUE) +INCLUDE(FindQt4) +INCLUDE(${QT_USE_FILE}) if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) @@ -53,4 +57,4 @@ IF(${QT_QTMULTIMEDIA_FOUND}) add_dependencies(qtmultimedia qmmp) target_link_libraries(qtmultimedia ${QT_LIBRARIES} -lqmmp) install(TARGETS qtmultimedia DESTINATION ${LIB_DIR}/qmmp/Output) -ENDIF(${QT_QTMULTIMEDIA_FOUND})
\ No newline at end of file +ENDIF(${QT_QTMULTIMEDIA_FOUND}) |