aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-08-28 13:46:42 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-08-28 13:46:42 +0200
commitabb110ea2ef341dba535847df79109401629c52f (patch)
treeca76b3a0c1c72b41763c1c2bbf88ff71ab45152c
parenta3ce38805255048fe2f4b2b2b3621f982f6dab14 (diff)
parent2d13ddd17b43986e3d0ffc49f86049e0b7feaa4f (diff)
downloadayatana-indicator-session-abb110ea2ef341dba535847df79109401629c52f.tar.gz
ayatana-indicator-session-abb110ea2ef341dba535847df79109401629c52f.tar.bz2
ayatana-indicator-session-abb110ea2ef341dba535847df79109401629c52f.zip
Merge branch 'tari01-pr/drop-lomiri-url-dispatcher'
Attribute GH PR #50: https://github.com/AyatanaIndicators/ayatana-indicator-session/pull/50
-rw-r--r--.build.yml5
-rw-r--r--src/CMakeLists.txt6
2 files changed, 5 insertions, 6 deletions
diff --git a/.build.yml b/.build.yml
index 81d29b6..6e1218f 100644
--- a/.build.yml
+++ b/.build.yml
@@ -15,6 +15,10 @@ requires:
- mate-common
- cmake
- intltool
+# - libayatana-common
+ - liblomiri-url-dispatcher
+ - gobject-introspection
+ - vala
- glib2
- systemd
@@ -56,7 +60,6 @@ requires:
- valac
- libglib2.0-dev
- libgtest-dev
- - liblomiri-url-dispatcher-dev
ubuntu:focal:
- autopoint
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eeaa113..fe83084 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,15 +16,11 @@ add_library (libayatanaindicatorsessionservice STATIC
include_directories(${SERVICE_INCLUDE_DIRS})
link_directories(${SERVICE_LIBRARY_DIRS})
-if(URLDISPATCHER_FOUND)
- add_definitions( -DHAS_URLDISPATCHER )
-endif()
-
set (SERVICE_EXEC "ayatana-indicator-session-service")
set_property (SOURCE main.c
APPEND PROPERTY COMPILE_DEFINITIONS
GETTEXT_PACKAGE="${GETTEXT_PACKAGE}"
LOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
add_executable (${SERVICE_EXEC} main.c)
-target_link_libraries (${SERVICE_EXEC} libayatanaindicatorsessionservice backenddbus ${SERVICE_LIBRARIES} ${URLDISPATCHER_LIBRARIES})
+target_link_libraries (${SERVICE_EXEC} libayatanaindicatorsessionservice backenddbus ${SERVICE_LIBRARIES})
install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})