aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-07-01 21:00:17 -0500
committerCharles Kerr <charles.kerr@canonical.com>2013-07-01 21:00:17 -0500
commite875abf22fc02939185b6aa881865cff58fc1543 (patch)
tree69bd5d76cc20bb0556f751a32a4472de22a81bd1 /src
parentcba24317a60a2670c0c917aaa637488b834da379 (diff)
downloadayatana-indicator-session-e875abf22fc02939185b6aa881865cff58fc1543.tar.gz
ayatana-indicator-session-e875abf22fc02939185b6aa881865cff58fc1543.tar.bz2
ayatana-indicator-session-e875abf22fc02939185b6aa881865cff58fc1543.zip
in cmake files, limit scopes by moving single-target properties out of the global variables to single-target ones and moving single-use includes into the directories where they're used
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt11
-rw-r--r--src/backend-dbus/CMakeLists.txt2
2 files changed, 11 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b327820..a00b6f1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,12 +9,19 @@ add_library (libindicatorsessionservice STATIC
service.h
users.c
users.h)
-set_target_properties (libindicatorsessionservice PROPERTIES COMPILE_FLAGS " -g ${CC_WARNING_ARGS} ${GCOV_FLAGS}")
-
include_directories(${SERVICE_INCLUDE_DIRS})
link_directories(${SERVICE_LIBRARY_DIRS})
set (SERVICE_EXEC "indicator-session-service")
+set_property (SOURCE main.c
+ APPEND PROPERTY COMPILE_DEFINITIONS
+ GETTEXT_PACKAGE="${GETTEXT_PACKAGE}"
+ GNOMELOCALEDIR="@CMAKE_INSTALL_FULL_LOCALEDIR@")
add_executable (${SERVICE_EXEC} main.c)
target_link_libraries (${SERVICE_EXEC} libindicatorsessionservice backenddbus ${SERVICE_LIBRARIES} ${GCOV_LIBS})
install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
+
+# common properties
+set_property (TARGET libindicatorsessionservice ${SERVICE_EXEC}
+ APPEND_STRING PROPERTY COMPILE_FLAGS
+ " -g ${CC_WARNING_ARGS} ${GCOV_FLAGS}")
diff --git a/src/backend-dbus/CMakeLists.txt b/src/backend-dbus/CMakeLists.txt
index 1c0df8e..fa41534 100644
--- a/src/backend-dbus/CMakeLists.txt
+++ b/src/backend-dbus/CMakeLists.txt
@@ -1,3 +1,5 @@
+include (GdbusCodegen)
+
set(BACKEND_GENERATED_SOURCES
)