From 4eb46086085e9e69e7726c30b11eb1eb4473e88f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Tue, 12 Feb 2013 04:34:49 +0100 Subject: [PATCH] Buildsystem changes for qtextracomponents plugin Basically disables everything from the build. Does not compile like this yet, but it's disabled in the toplevel anyway. --- .../qtextracomponents/CMakeLists.txt | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/declarativeimports/qtextracomponents/CMakeLists.txt b/declarativeimports/qtextracomponents/CMakeLists.txt index e30fb0bff..95b1bb12a 100644 --- a/declarativeimports/qtextracomponents/CMakeLists.txt +++ b/declarativeimports/qtextracomponents/CMakeLists.txt @@ -1,16 +1,16 @@ project(qtextracomponents) -include(KDE4Defaults) +#include(KDE4Defaults) add_subdirectory(tests) set(qtextracomponents_SRCS qtextracomponentsplugin.cpp - qpixmapitem.cpp - qimageitem.cpp - qiconitem.cpp - mouseeventlistener.cpp - columnproxymodel.cpp +# qpixmapitem.cpp +# qimageitem.cpp +# qiconitem.cpp +# mouseeventlistener.cpp +# columnproxymodel.cpp ) INCLUDE_DIRECTORIES( @@ -21,10 +21,23 @@ INCLUDE_DIRECTORIES( qt4_automoc(${qtextracomponents_SRCS}) - add_library(qtextracomponentsplugin SHARED ${qtextracomponents_SRCS}) -target_link_libraries(qtextracomponentsplugin ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}) -install(TARGETS qtextracomponentsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/qtextracomponents) +target_link_libraries(qtextracomponentsplugin + ${QT_QTCORE_LIBRARY} + ${Qt5Quick_LIBRARIES} + ${Qt5Qml_LIBRARIES} + ${QT_QTGUI_LIBRARY} + ${KDE4_KDEUI_LIBRARY} + ${KDECLARATIVE_LIBRARIES} + plasma) +#${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${Qt5Quick_LIBRARIES} ${Qt5Qml_LIBRARIES}) -install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/qtextracomponents) +# set(QML_INSTALL_DIR "/home/sebas/kf5/install/lib/qml") +# message("!!! Forcing Imports install location: ${QML_INSTALL_DIR}") +# message("!!! Remove once merged into cmake-extra-modules") +message("### QML_INSTALL_DIR ${QML_INSTALL_DIR}") + +install(TARGETS qtextracomponentsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/qtextracomponents) + +install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/qtextracomponents)