diff options
| author | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2016-01-05 15:08:02 +0000 |
|---|---|---|
| committer | CI Train Bot <ci-train-bot@canonical.com> | 2016-01-05 15:08:02 +0000 |
| commit | 6869e11338783297c2b3fd3b4184cca1cd2d2150 (patch) | |
| tree | b655eb961c3265d3ffb987cf3e9740f6fbc2da73 /src/CMakeLists.txt | |
| parent | c0c4180561fba3e1ebe3f22381a4b5609e22f17b (diff) | |
| parent | 58e4e5dd08444a193a52ae103f6bd432772dacc7 (diff) | |
| download | ayatana-indicator-sound-6869e11338783297c2b3fd3b4184cca1cd2d2150.tar.gz ayatana-indicator-sound-6869e11338783297c2b3fd3b4184cca1cd2d2150.tar.bz2 ayatana-indicator-sound-6869e11338783297c2b3fd3b4184cca1cd2d2150.zip | |
This branch just readds the OSD notifications code, that was reverted in trunk as the corresponding silo was also rolled back after landing.
Approved by: PS Jenkins bot, Xavi Garcia
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 194dfc9..6c621ae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,12 +8,12 @@ set(SYMBOLS_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.def") set(VAPI_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.vapi") vapi_gen(accounts-service - LIBRARY - accounts-service - PACKAGES - gio-2.0 - INPUT - /usr/share/gir-1.0/AccountsService-1.0.gir + LIBRARY + accounts-service + PACKAGES + gio-2.0 + INPUT + /usr/share/gir-1.0/AccountsService-1.0.gir ) vala_init(indicator-sound-service @@ -70,7 +70,7 @@ vala_add(indicator-sound-service media-player-user.vala DEPENDS media-player - accounts-service-sound-settings + accounts-service-sound-settings greeter-broadcast ) vala_add(indicator-sound-service @@ -103,6 +103,7 @@ vala_add(indicator-sound-service sound-menu.vala DEPENDS media-player + volume-control ) vala_add(indicator-sound-service accounts-service-user.vala @@ -164,8 +165,8 @@ add_definitions( ) add_library( - indicator-sound-service-lib STATIC - ${INDICATOR_SOUND_SOURCES} + indicator-sound-service-lib STATIC + ${INDICATOR_SOUND_SOURCES} ) target_link_libraries( @@ -206,3 +207,5 @@ install( RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/indicator-sound/ ) +# Disable integration tests +# add_subdirectory(gmenuharness) |