Centralize Qt5 component loading and use same variable as other frameworks

This commit is contained in:
Aurélien Gâteau 2014-04-26 02:20:13 +02:00
parent ae92074071
commit d988b10870
3 changed files with 2 additions and 7 deletions

View File

@ -37,9 +37,9 @@ endif()
################# now find all used packages #################
set (QT_MIN_VERSION "5.2.0")
set (REQUIRED_QT_VERSION "5.2.0")
find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Quick Sql Qml Widgets Svg Script)
find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Quick Sql Qml Widgets Svg Script Test)
find_package(KF5Activities ${KF5_VERSION} REQUIRED)
find_package(KF5Archive ${KF5_VERSION} REQUIRED)

View File

@ -1,6 +1,3 @@
find_package(Qt5Test 5.2.0 REQUIRED NO_MODULE)
set_package_properties(Qt5Test PROPERTIES PURPOSE "Required for tests")
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
include(ECMMarkAsTest)

View File

@ -7,8 +7,6 @@ set(platformcomponents_SRCS
icondialog.cpp
)
find_package(Qt5 5.2.0 REQUIRED NO_MODULE COMPONENTS Core DBus Qml)
add_library(platformcomponentsplugin SHARED ${platformcomponents_SRCS})
target_link_libraries(