slight progress in making the repo link again

This commit is contained in:
Marco Martin 2013-02-05 21:37:42 +01:00
parent 39f1048f15
commit 492bd13b00
3 changed files with 5 additions and 5 deletions

View File

@ -32,7 +32,7 @@ message("!!! Forcing Imports install location: ${IMPORTS_INSTALL_DIR}")
add_library(corebindingsplugin SHARED ${corebindings_SRCS})
target_link_libraries(corebindingsplugin ${KDE4_PLASMA_LIBS} ${QT_QTSCRIPT_LIBRARY} ${Qt5Quick_LIBRARIES} ${Qt5Qml_LIBRARIES} ${KDECLARATIVE_LIBRARIES})
target_link_libraries(corebindingsplugin ${QT_QTSCRIPT_LIBRARY} ${Qt5Quick_LIBRARIES} ${Qt5Qml_LIBRARIES} ${KDECLARATIVE_LIBRARIES} plasma)
install(TARGETS corebindingsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/core)
install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/core)

View File

@ -183,7 +183,7 @@ kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS})
target_link_libraries(plasma ${QT_QTUITOOLS_LIBRARY}
${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY}
${KDE4_KDEUI_LIBS} kdnssd threadweaver kauth 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
target_link_libraries(plasma ${KDEPIMLIBS_GPGMEPP_LIBS} kdeclarative karchive)
@ -199,7 +199,7 @@ if(DL_LIBRARY)
target_link_libraries(plasma ${DL_LIBRARY})
endif(DL_LIBRARY)
target_link_libraries(plasma LINK_INTERFACE_LIBRARIES kdeui kdecore kwindowsystem Qt5::Widgets)
target_link_libraries(plasma LINK_INTERFACE_LIBRARIES kdecore Qt5::Widgets)
#do NOT use GENERIC versioning -- the plasma team will take care of versioning
set_target_properties(plasma PROPERTIES

View File

@ -43,8 +43,8 @@ target_link_libraries(testplasma2
${Qt5Quick_LIBRARIES}
${Qt5Qml_LIBRARIES}
${kcoreaddons}
${KDE4_PLASMA_LIBS}
#plasma
#${KDE4_PLASMA_LIBS}
plasma
)
install(TARGETS testplasma2 ${INSTALL_TARGETS_DEFAULT_ARGS})