From c87f09ee998a3f4bdffa6d8b45c3614e025d5877 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 2 Dec 2017 21:51:26 +0000 Subject: Vala defines != C defines. --- src/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') 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 -- cgit v1.2.3