Use QML_INSTALL_DIR
... instead of screwing with IMPORTS_INSTALL_DIR. We're still setting it by hand until the corresponding patch in cmake-extra-modules is merged.
This commit is contained in:
parent
943a549712
commit
092220952c
@ -27,11 +27,9 @@ set(corebindings_SRCS
|
|||||||
|
|
||||||
qt4_automoc(${corebindings_SRCS})
|
qt4_automoc(${corebindings_SRCS})
|
||||||
|
|
||||||
# Qt installs plugins here:
|
set(QML_INSTALL_DIR "/qml")
|
||||||
# /home/sebas/kf5/qt5/qtdeclarative/src/imports/window/plugins.qmltypes /home/sebas/kf5/install/qml/QtQuick/Window.2/
|
message("!!! Forcing Imports install location: ${QML_INSTALL_DIR}")
|
||||||
set(IMPORTS_INSTALL_DIR "qml")
|
message("!!! Remove once merged into cmake-extra-modules")
|
||||||
message("!!! Forcing Imports install location: ${IMPORTS_INSTALL_DIR}")
|
|
||||||
|
|
||||||
|
|
||||||
add_library(corebindingsplugin SHARED ${corebindings_SRCS})
|
add_library(corebindingsplugin SHARED ${corebindings_SRCS})
|
||||||
target_link_libraries(corebindingsplugin
|
target_link_libraries(corebindingsplugin
|
||||||
@ -43,7 +41,7 @@ target_link_libraries(corebindingsplugin
|
|||||||
${KDE4_KDECORE_LIBS}
|
${KDE4_KDECORE_LIBS}
|
||||||
plasma)
|
plasma)
|
||||||
|
|
||||||
install(TARGETS corebindingsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/core)
|
install(TARGETS corebindingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core)
|
||||||
install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/core)
|
install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core)
|
||||||
|
|
||||||
#add_subdirectory(tests)
|
#add_subdirectory(tests)
|
||||||
|
Loading…
Reference in New Issue
Block a user