diff options
| author | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-10-21 15:16:58 +0200 |
|---|---|---|
| committer | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-10-21 15:16:58 +0200 |
| commit | 4dbdcf30a0ed10019d3350293c4ac52040393640 (patch) | |
| tree | fa01e697dee299506a91d1d9f41c2a61f429fcc9 /src/CMakeLists.txt | |
| parent | 6ee23e401d3847e609f1ef50e1736f69e6253608 (diff) | |
| parent | 86c449a7125f3ff90dcac353c8a4ad5a8c2cc46e (diff) | |
| download | ayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.tar.gz ayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.tar.bz2 ayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.zip | |
Fixed conflict. Updated changelog to be in sync with trunk
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 194dfc9..73a270c 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,4 @@ install( RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/indicator-sound/ ) +add_subdirectory(gmenuharness) |