Handle failed database initialisation more gracefully

[onak.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index acacb34a2a510aa58f5d98d92073419b2a7764ed..e53ad465ca0687536b3264d762d969eee664c7d2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,10 +41,18 @@ endif()
 # Pick up a git based version number for development builds
 find_package(Git)
 if (GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
-       EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe --tags --dirty
-               OUTPUT_VARIABLE GIT_VERSION
-               OUTPUT_STRIP_TRAILING_WHITESPACE)
-       string(REPLACE "onak-" "" VERSION ${GIT_VERSION})
+       if (EXISTS "${CMAKE_SOURCE_DIR}/.git/refs/tags/onak-0.6.2")
+               EXECUTE_PROCESS(
+                       COMMAND ${GIT_EXECUTABLE} describe --tags --dirty
+                       OUTPUT_VARIABLE GIT_VERSION
+                       OUTPUT_STRIP_TRAILING_WHITESPACE)
+               string(REPLACE "onak-" "" VERSION ${GIT_VERSION})
+       else()
+               EXECUTE_PROCESS(
+                       COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+                       OUTPUT_VARIABLE VERSION
+                       OUTPUT_STRIP_TRAILING_WHITESPACE)
+       endif()
 else()
        set(VERSION ${PROJECT_VERSION})
 endif()
@@ -85,6 +93,12 @@ if (GMP_FOUND)
        CHECK_SYMBOL_EXISTS(nettle_get_secp_521r1 "nettle/ecc-curve.h" HAVE_NETTLE_GET_SECP_521R1)
 endif()
 
+# keyd will use this for socket activation, if it's available
+pkg_check_modules(SYSTEMD libsystemd)
+if (SYSTEMD_FOUND)
+       set(HAVE_SYSTEMD true)
+endif()
+
 # Build files that have substitutions in them
 include_directories(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
 configure_file("${CMAKE_SOURCE_DIR}/build-config.h.in"