Commit 4cd91ef0 authored by Ben Cooksley's avatar Ben Cooksley
Browse files

Use LDFLAGS to ensure the compiler knows where to look for the libraries

parent 93b968bd
......@@ -21,8 +21,8 @@ set(plasma_networkmanagement_qml_plugins_SRCS
kde4_add_library(plasmanetworkmanagementplugins SHARED ${plasma_networkmanagement_qml_plugins_SRCS})
target_link_libraries(plasmanetworkmanagementplugins
NetworkManagerQt
ModemManagerQt
${NETWORKMANAGERQT_LDFLAGS}
${MODEMMANAGERQT_LDFLAGS}
plasmanetworkmanagement-internal
plasmanetworkmanagement-editor
${KDE4_PLASMA_LIBS}
......
......@@ -15,7 +15,7 @@ kde4_add_ui_files(connectioneditor_SRCS
kde4_add_executable(kde-nm-connection-editor ${connectioneditor_SRCS})
target_link_libraries(kde-nm-connection-editor plasmanetworkmanagement-internal plasmanetworkmanagement-editor NetworkManagerQt ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
target_link_libraries(kde-nm-connection-editor plasmanetworkmanagement-internal plasmanetworkmanagement-editor ${NETWORKMANAGERQT_LDFLAGS} ${MODEMMANAGERQT_LDFLAGS} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
install(TARGETS kde-nm-connection-editor DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
install(PROGRAMS kde-nm-connection-editor.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
......
......@@ -29,8 +29,8 @@ endif()
kde4_add_plugin(kded_networkmanagement ${kded_networkmanagement_SRCS})
target_link_libraries(kded_networkmanagement
NetworkManagerQt
ModemManagerQt
${NETWORKMANAGERQT_LDFLAGS}
${MODEMMANAGERQT_LDFLAGS}
plasmanetworkmanagement-internal
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
......
......@@ -21,7 +21,7 @@ else()
endif()
kde4_add_library(plasmanetworkmanagement-internal SHARED ${plasmanetworkmanagement-internal_SRCS})
target_link_libraries(plasmanetworkmanagement-internal NetworkManagerQt ModemManagerQt ${KDE4_SOLID_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTNETWORK_LIBRARY})
target_link_libraries(plasmanetworkmanagement-internal ${NETWORKMANAGERQT_LDFLAGS} ${MODEMMANAGERQT_LDFLAGS} ${KDE4_SOLID_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTNETWORK_LIBRARY})
install(TARGETS plasmanetworkmanagement-internal ${INSTALL_TARGETS_DEFAULT_ARGS})
......
......@@ -60,8 +60,8 @@ target_link_libraries(plasmanetworkmanagement-editor
${KDE4_KIO_LIBS}
${QT_QTXML_LIBRARY}
${QT_QTNETWORK_LIBRARY}
NetworkManagerQt
ModemManagerQt
${NETWORKMANAGERQT_LDFLAGS}
${MODEMMANAGERQT_LDFLAGS}
plasmanetworkmanagement-internal
)
......
......@@ -10,7 +10,7 @@ kde4_add_ui_files(l2tp_SRCS l2tp.ui l2tpadvanced.ui l2tpauth.ui l2tpppp.ui)
kde4_add_plugin(plasmanetworkmanagement_l2tpui ${l2tp_SRCS})
target_link_libraries(plasmanetworkmanagement_l2tpui plasmanetworkmanagement-internal NetworkManagerQt ${KDE4_KIO_LIBS})
target_link_libraries(plasmanetworkmanagement_l2tpui plasmanetworkmanagement-internal ${NETWORKMANAGERQT_LDFLAGS} ${KDE4_KIO_LIBS})
install(TARGETS plasmanetworkmanagement_l2tpui DESTINATION ${PLUGIN_INSTALL_DIR})
......
......@@ -8,7 +8,7 @@ kde4_add_ui_files(openswan_SRCS openswan.ui openswanauth.ui)
kde4_add_plugin(plasmanetworkmanagement_openswanui ${openswan_SRCS})
target_link_libraries(plasmanetworkmanagement_openswanui plasmanetworkmanagement-internal NetworkManagerQt ${KDE4_KIO_LIBS})
target_link_libraries(plasmanetworkmanagement_openswanui plasmanetworkmanagement-internal ${NETWORKMANAGERQT_LDFLAGS} ${KDE4_KIO_LIBS})
install(TARGETS plasmanetworkmanagement_openswanui DESTINATION ${PLUGIN_INSTALL_DIR})
......
......@@ -9,7 +9,7 @@ kde4_add_ui_files(openvpn_SRCS openvpn.ui openvpnauth.ui openvpnadvanced.ui)
kde4_add_plugin(plasmanetworkmanagement_openvpnui ${openvpn_SRCS})
target_link_libraries(plasmanetworkmanagement_openvpnui plasmanetworkmanagement-internal NetworkManagerQt ${KDE4_KIO_LIBS})
target_link_libraries(plasmanetworkmanagement_openvpnui plasmanetworkmanagement-internal ${NETWORKMANAGERQT_LDFLAGS} ${KDE4_KIO_LIBS})
install(TARGETS plasmanetworkmanagement_openvpnui DESTINATION ${PLUGIN_INSTALL_DIR})
......
......@@ -8,7 +8,7 @@ kde4_add_ui_files(pptp_SRCS pptpprop.ui pptpadvanced.ui pptpauth.ui)
kde4_add_plugin(plasmanetworkmanagement_pptpui ${pptp_SRCS})
target_link_libraries(plasmanetworkmanagement_pptpui NetworkManagerQt ${KDE4_KIO_LIBS} plasmanetworkmanagement-internal)
target_link_libraries(plasmanetworkmanagement_pptpui ${NETWORKMANAGERQT_LDFLAGS} ${KDE4_KIO_LIBS} plasmanetworkmanagement-internal)
install(TARGETS plasmanetworkmanagement_pptpui DESTINATION ${PLUGIN_INSTALL_DIR})
......
......@@ -8,7 +8,7 @@ kde4_add_ui_files(strongswan_SRCS strongswanprop.ui strongswanauth.ui)
kde4_add_plugin(plasmanetworkmanagement_strongswanui ${strongswan_SRCS})
target_link_libraries(plasmanetworkmanagement_strongswanui NetworkManagerQt ${KDE4_KIO_LIBS} plasmanetworkmanagement-internal)
target_link_libraries(plasmanetworkmanagement_strongswanui ${NETWORKMANAGERQT_LDFLAGS} ${KDE4_KIO_LIBS} plasmanetworkmanagement-internal)
install(TARGETS plasmanetworkmanagement_strongswanui DESTINATION ${PLUGIN_INSTALL_DIR})
......
......@@ -9,7 +9,7 @@ kde4_add_ui_files(vpnc_SRCS vpnc.ui vpncadvanced.ui vpncauth.ui)
kde4_add_plugin(plasmanetworkmanagement_vpncui ${vpnc_SRCS})
target_link_libraries(plasmanetworkmanagement_vpncui plasmanetworkmanagement-internal NetworkManagerQt ${KDE4_KIO_LIBS})
target_link_libraries(plasmanetworkmanagement_vpncui plasmanetworkmanagement-internal ${NETWORKMANAGERQT_LDFLAGS} ${KDE4_KIO_LIBS})
install(TARGETS plasmanetworkmanagement_vpncui DESTINATION ${PLUGIN_INSTALL_DIR})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment