Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Fix last merge - missing changes in src/CMakeLists.txt

parent d1cdada8
include_directories(${PULSEAUDIO_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${GCONF_INCLUDE_DIRS}
${GOBJECT_INCLUDE_DIRS})
include_directories(${PULSEAUDIO_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR})
set(cpp_SRCS
card.cpp
......@@ -15,7 +14,6 @@ set(cpp_SRCS
sink.cpp
sinkinput.cpp
modulemanager.cpp
gconfitem.cpp
source.cpp
sourceoutput.cpp
stream.cpp
......@@ -38,6 +36,11 @@ set(qml_SRCS
set_property(SOURCE qml/dbus/osdService.xml APPEND PROPERTY CLASSNAME OsdServiceInterface)
qt5_add_dbus_interface(dbus_SRCS qml/dbus/osdService.xml osdservice)
if (HAVE_GCONF)
include_directories(${GCONF_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS})
set(cpp_SRCS ${cpp_SRCS} gconfitem.cpp)
endif()
add_library(plasma-volume-declarative SHARED ${dbus_SRCS} ${cpp_SRCS} ${qml_SRCS})
target_link_libraries(plasma-volume-declarative
Qt5::Core
......@@ -47,11 +50,16 @@ target_link_libraries(plasma-volume-declarative
KF5::GlobalAccel
${PULSEAUDIO_LIBRARY}
${PULSEAUDIO_MAINLOOP_LIBRARY}
${GCONF_LDFLAGS}
${GOBJECT_LDFLAGS}
${CANBERRA_LIBRARIES}
)
if (HAVE_GCONF)
target_link_libraries(plasma-volume-declarative
${GCONF_LDFLAGS}
${GOBJECT_LDFLAGS}
)
endif()
set(PRIVATE_QML_INSTALL_DIR ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/volume)
install(TARGETS plasma-volume-declarative DESTINATION ${PRIVATE_QML_INSTALL_DIR})
install(FILES ${qml_SRCS} DESTINATION ${PRIVATE_QML_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