From ae39f7001e5603010afc02de29787ade6d48ef14 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Fri, 22 Mar 2013 16:34:34 -0500
Subject: port indicator-session to GMenu/cmake. Code coverage increased from
 0% to 95.4%.

---
 src/CMakeLists.txt | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 src/CMakeLists.txt

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..efa704c
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_subdirectory (backend-dbus)
+
+add_library (libindicatorsessionservice STATIC
+             actions.c
+             actions.h
+             guest.c
+             guest.h
+             service.c
+             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})
+
+add_executable (indicator-session-service main.c)
+target_link_libraries (indicator-session-service libindicatorsessionservice backenddbus ${SERVICE_LIBRARIES} ${GCOV_LIBS})
+
-- 
cgit v1.2.3


From 6def7fceae5ea55e6d44ede05146f6a95add317c Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 20 Jun 2013 17:31:07 -0500
Subject: install .schema.xml and indicator-session-service in the right
 places.

---
 src/CMakeLists.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index efa704c..7b65629 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,6 +14,7 @@ set_target_properties (libindicatorsessionservice PROPERTIES COMPILE_FLAGS " -g
 include_directories(${SERVICE_INCLUDE_DIRS})
 link_directories(${SERVICE_LIBRARY_DIRS})
 
-add_executable (indicator-session-service main.c)
-target_link_libraries (indicator-session-service libindicatorsessionservice backenddbus ${SERVICE_LIBRARIES} ${GCOV_LIBS})
-
+set (SERVICE_EXEC "indicator-session-service")
+add_executable (${SERVICE_EXEC} main.c)
+target_link_libraries (${SERVICE_EXEC} libindicatorsessionservice backenddbus ${SERVICE_LIBRARIES} ${GCOV_LIBS})
+install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${PROJECT_LIBEXECDIR})
-- 
cgit v1.2.3


From 47bd4aebb17b165792c5883e73c99f57d601778b Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 1 Jul 2013 19:27:04 -0500
Subject: in our cmake files, rename PROJECT_LIBEXECDIR as
 CMAKE_INSTALL_LIBEXECDIR and CMAKE_INSTALL_FULL_LIBEXECDIR for consistency
 with the other GNUInstallDirs

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7b65629..b327820 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,4 +17,4 @@ link_directories(${SERVICE_LIBRARY_DIRS})
 set (SERVICE_EXEC "indicator-session-service")
 add_executable (${SERVICE_EXEC} main.c)
 target_link_libraries (${SERVICE_EXEC} libindicatorsessionservice backenddbus ${SERVICE_LIBRARIES} ${GCOV_LIBS})
-install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${PROJECT_LIBEXECDIR})
+install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
-- 
cgit v1.2.3


From e875abf22fc02939185b6aa881865cff58fc1543 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 1 Jul 2013 21:00:17 -0500
Subject: 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

---
 src/CMakeLists.txt | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/CMakeLists.txt')

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}")
-- 
cgit v1.2.3