From ca4b40ade7f432d98c21ac499a0de63244b1c3cc Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Sat, 23 Mar 2013 10:04:13 -0500
Subject: use pete woods' hud cmake code for the build.sh script to check for
 Ninja and to move the gdbus-codegen macros into a resuable file in the cmake/
 directory.

---
 CMakeLists.txt | 66 ++++++++++++++++++++++++----------------------------------
 1 file changed, 27 insertions(+), 39 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f8f026..feb332c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,43 +1,35 @@
 project (indicator-session C CXX)
-set (PROJECT_VERSION "13.10.1")
 cmake_minimum_required (VERSION 2.8.9)
+
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
-option (full_warnings "Full compiler warnings." ON)
+set (PROJECT_VERSION "13.10.1")
+set (PACKAGE ${CMAKE_PROJECT_NAME})
+set (GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
+
 option (enable_tests "Build the package's automatic tests." ON)
+option (full_warnings "Full compiler warnings." ON)
 option (enable_lcov "Generate lcov code coverage reports." ON)
 
-set (ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${PROJECT_VERSION})
-set (CC_WARNING_ARGS " -Wall -pedantic -Wextra -Wno-missing-field-initializers")
-
-#
-# Check for glib/gio
-#
 
+find_package(PkgConfig REQUIRED)
 include (FindPkgConfig)
+include (GdbusCodegen)
+include (GSettings)
+
+add_definitions( -DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}" )
+add_definitions (-DGNOMELOCALEDIR=\"@CMAKE_INSTALL_PREFIX@/share/locale\")
+
 pkg_check_modules (SERVICE REQUIRED
                    glib-2.0>=2.35.4
                    gio-unix-2.0>=2.25.11)
 include_directories (${SERVICE_INCLUDE_DIRS})
 
-#
-# Testing / Coverage
-#
+set (CC_WARNING_ARGS " -Wall -pedantic -Wextra -Wno-missing-field-initializers")
 
-if (${enable_tests})
-  set (GTEST_SOURCE_DIR /usr/src/gtest/src)
-  set (GTEST_INCLUDE_DIR ${GTEST_SOURCE_DIR}/..)
-  set (GTEST_LIBS -lpthread)
-  enable_testing ()
-  if (${enable_lcov})
-    include(cmake/GCov.cmake)
-  endif ()
-endif ()
 
-#
-# Custom Targets 
-#
 
+set (ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${PROJECT_VERSION})
 add_custom_target (dist
                    COMMAND bzr export --root=${ARCHIVE_NAME} ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.gz
                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
@@ -47,25 +39,21 @@ add_custom_target (clean-coverage
 
 add_custom_target (cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2 --inline-suppr
                    ${CMAKE_SOURCE_DIR}/src
-                   ${CMAKE_SOURCE_DIR}/test)
-
-#
-# 
-#
+                   ${CMAKE_SOURCE_DIR}/tests)
 
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src)
+include_directories (${CMAKE_CURRENT_BINARY_DIR}/src)
 
-add_definitions (-DGETTEXT_PACKAGE=\"indicator-session\")
-add_definitions (-DPACKAGE_NAME=\"indicator-session\")
-add_definitions (-DGNOMELOCALEDIR=\"@CMAKE_INSTALL_PREFIX@/share/locale\")
-
-#
-#  Directories
-#
+add_subdirectory (src)
+add_subdirectory (data)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
-
-add_subdirectory(src)
-add_subdirectory(data)
 if (${enable_tests})
+  set (GTEST_SOURCE_DIR /usr/src/gtest/src)
+  set (GTEST_INCLUDE_DIR ${GTEST_SOURCE_DIR}/..)
+  set (GTEST_LIBS -lpthread)
+  enable_testing ()
+  if (${enable_lcov})
+    include(cmake/GCov.cmake)
+  endif ()
   add_subdirectory(tests)
 endif ()
-- 
cgit v1.2.3