diff --git a/declarativeimports/CMakeLists.txt b/declarativeimports/CMakeLists.txt index f0f28ec91..4f6e8c4cc 100644 --- a/declarativeimports/CMakeLists.txt +++ b/declarativeimports/CMakeLists.txt @@ -1,3 +1,8 @@ +set(QML_INSTALL_DIR "${LIB_INSTALL_DIR}/qml") +message("!!! Forcing Imports install location: ${QML_INSTALL_DIR}") +message("!!! Remove once merged into cmake-extra-modules") + + add_subdirectory(core) #add_subdirectory(draganddrop) #add_subdirectory(krunnermodel) diff --git a/declarativeimports/core/CMakeLists.txt b/declarativeimports/core/CMakeLists.txt index c31c089e4..3bb00a1d0 100644 --- a/declarativeimports/core/CMakeLists.txt +++ b/declarativeimports/core/CMakeLists.txt @@ -27,10 +27,6 @@ set(corebindings_SRCS qt4_automoc(${corebindings_SRCS}) -set(QML_INSTALL_DIR "/qml") -message("!!! Forcing Imports install location: ${QML_INSTALL_DIR}") -message("!!! Remove once merged into cmake-extra-modules") - add_library(corebindingsplugin SHARED ${corebindings_SRCS}) target_link_libraries(corebindingsplugin ${QT_QTSCRIPT_LIBRARY} diff --git a/declarativeimports/plasmacomponents/CMakeLists.txt b/declarativeimports/plasmacomponents/CMakeLists.txt index 8e964399e..f243b6d6c 100644 --- a/declarativeimports/plasmacomponents/CMakeLists.txt +++ b/declarativeimports/plasmacomponents/CMakeLists.txt @@ -22,10 +22,6 @@ INCLUDE_DIRECTORIES( qt4_automoc(${plasmacomponents_SRCS}) -set(QML_INSTALL_DIR "/qml") -message("!!! Forcing Imports install location: ${QML_INSTALL_DIR}") -message("!!! Remove once merged into cmake-extra-modules") - add_library(plasmacomponentsplugin SHARED ${plasmacomponents_SRCS}) target_link_libraries(plasmacomponentsplugin ${QT_QTCORE_LIBRARY} @@ -36,6 +32,7 @@ target_link_libraries(plasmacomponentsplugin ${KDECLARATIVE_LIBRARIES} plasma) + install(TARGETS plasmacomponentsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/components) install(DIRECTORY qml/ DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/components)