search for KF5, use KF5 namespace in linking some stuff
This commit is contained in:
parent
78b7331238
commit
949a4222cb
@ -58,8 +58,10 @@ configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCu
|
|||||||
|
|
||||||
set (QT_MIN_VERSION "5.0.0")
|
set (QT_MIN_VERSION "5.0.0")
|
||||||
|
|
||||||
|
find_package(KF5 REQUIRED)
|
||||||
find_package(KDE4Internal REQUIRED)
|
find_package(KDE4Internal REQUIRED)
|
||||||
#find_package(KF5Transitional REQUIRED)
|
#find_package(KF5Transitional REQUIRED)
|
||||||
|
|
||||||
include(KDE4Defaults)
|
include(KDE4Defaults)
|
||||||
#include (MacroLibrary)
|
#include (MacroLibrary)
|
||||||
|
|
||||||
@ -69,6 +71,7 @@ find_package(itemmodels REQUIRED)
|
|||||||
find_package(kwidgetsaddons REQUIRED)
|
find_package(kwidgetsaddons REQUIRED)
|
||||||
find_package(kwindowsystem REQUIRED)
|
find_package(kwindowsystem REQUIRED)
|
||||||
find_package(kcodecs REQUIRED)
|
find_package(kcodecs REQUIRED)
|
||||||
|
find_package(karchive REQUIRED)
|
||||||
find_package(ki18n REQUIRED)
|
find_package(ki18n REQUIRED)
|
||||||
find_package(kcoreaddons REQUIRED)
|
find_package(kcoreaddons REQUIRED)
|
||||||
find_package(solid REQUIRED)
|
find_package(solid REQUIRED)
|
||||||
|
@ -185,7 +185,7 @@ target_link_libraries(plasma ${QT_QTUITOOLS_LIBRARY}
|
|||||||
${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY}
|
${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY}
|
||||||
${KDE4_KDEUI_LIBS} kdnssd threadweaver kauth KF5::kwindowsystem ${PLASMA_EXTRA_LIBS} kcoreaddons ki18n)
|
${KDE4_KDEUI_LIBS} kdnssd threadweaver kauth KF5::kwindowsystem ${PLASMA_EXTRA_LIBS} kcoreaddons ki18n)
|
||||||
#FIXME gpgme++ is in kdepimlibs, neeeds to be elsewhere
|
#FIXME gpgme++ is in kdepimlibs, neeeds to be elsewhere
|
||||||
target_link_libraries(plasma ${KDEPIMLIBS_GPGMEPP_LIBS} kdeclarative karchive)
|
target_link_libraries(plasma ${KDEPIMLIBS_GPGMEPP_LIBS} kdeclarative KF5::karchive)
|
||||||
|
|
||||||
if(QCA2_FOUND)
|
if(QCA2_FOUND)
|
||||||
target_link_libraries(plasma ${QCA2_LIBRARIES})
|
target_link_libraries(plasma ${QCA2_LIBRARIES})
|
||||||
|
@ -8,7 +8,7 @@ MACRO(PLASMA_UNIT_TESTS)
|
|||||||
FOREACH(_testname ${ARGN})
|
FOREACH(_testname ${ARGN})
|
||||||
kde4_add_unit_test(${_testname} TESTNAME plasma-${_testname} ${_testname}.cpp)
|
kde4_add_unit_test(${_testname} TESTNAME plasma-${_testname} ${_testname}.cpp)
|
||||||
target_link_libraries(${_testname} ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
|
target_link_libraries(${_testname} ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
|
||||||
${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} plasma kcoreaddons karchive)
|
${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} plasma kcoreaddons KF5::karchive)
|
||||||
if(QT_QTOPENGL_FOUND)
|
if(QT_QTOPENGL_FOUND)
|
||||||
target_link_libraries(${_testname} ${QT_QTOPENGL_LIBRARY})
|
target_link_libraries(${_testname} ${QT_QTOPENGL_LIBRARY})
|
||||||
endif(QT_QTOPENGL_FOUND)
|
endif(QT_QTOPENGL_FOUND)
|
||||||
|
Loading…
Reference in New Issue
Block a user