diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-02 21:51:26 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-02 21:51:26 +0000 |
| commit | c87f09ee998a3f4bdffa6d8b45c3614e025d5877 (patch) | |
| tree | d8b6bec0d9ddde59bcabc3f796d60fd9089875c7 /src | |
| parent | 2fc15b83acf6b52e1192d96e40bd022fbdf9745a (diff) | |
| download | ayatana-indicator-sound-c87f09ee998a3f4bdffa6d8b45c3614e025d5877.tar.gz ayatana-indicator-sound-c87f09ee998a3f4bdffa6d8b45c3614e025d5877.tar.bz2 ayatana-indicator-sound-c87f09ee998a3f4bdffa6d8b45c3614e025d5877.zip | |
Vala defines != C defines.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0bdac85..3e2805e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,10 +7,13 @@ set(SYMBOLS_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.def") set(VAPI_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.vapi") if(URLDISPATCHER_FOUND) + set (VALA_DEFINE_URLDISPATCHER "--define=HAS_URL_DISPATCHER") + set (VALA_PKG_URLDISPATCHER "--pkg=url-dispatcher") add_definitions( -DHAS_URLDISPATCHER ) endif() if(EXISTS "/usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml") + set (VALA_DEFINE_UBUNTU_SOUND_SCHEMA "--define=HAS_UBUNTU_SOUND_SCHEMA") add_definitions( -DHAS_UBUNTU_SOUND_SCHEMA ) endif() @@ -43,6 +46,9 @@ vala_init(ayatana-indicator-sound-service --vapidir=${CMAKE_SOURCE_DIR}/vapi/ --vapidir=. --pkg=bus-watcher + ${VALA_PKG_URLDISPATCHER} + ${VALA_DEFINE_URLDISPATCHER} + ${VALA_DEFINE_UBUNTU_SOUND_SCHEMA} ) vala_add(ayatana-indicator-sound-service @@ -77,8 +83,6 @@ if(URLDISPATCHER_FOUND) mpris2-interfaces accounts-service-user accounts-service-access - OPTIONS - --pkg=url-dispatcher ) else() vala_add(ayatana-indicator-sound-service |