From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Sun, 22 May 2011 11:02:34 +0000 (+0200)
Subject: To avoid double dbus version definitions take values from configure.ac.
X-Git-Tag: dbus-1.5.2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39703607e4b504070a6f10b2c2f0592c84cc8e85;p=thirdparty%2Fdbus.git

To avoid double dbus version definitions take values from configure.ac.
---

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 13cdb741b..9b9ac546c 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -1,8 +1,12 @@
 project(dbus)
 
-set (DBUS_MAJOR_VERSION "1")
-set (DBUS_MINOR_VERSION "4")
-set (DBUS_MICRO_VERSION "3")
+#########################################################################
+# detect version
+#########################################################################
+file (READ ../configure.ac configure_ac)
+string (REGEX REPLACE ".*dbus_major_version], .([0-9]+).*" "\\1" DBUS_MAJOR_VERSION ${configure_ac})
+string (REGEX REPLACE ".*dbus_minor_version], .([0-9]+).*" "\\1" DBUS_MINOR_VERSION ${configure_ac})
+string (REGEX REPLACE ".*dbus_micro_version], .([0-9]+).*" "\\1" DBUS_MICRO_VERSION ${configure_ac})
 # used by file version info
 set (DBUS_PATCH_VERSION "0")
 set (DBUS_VERSION ${DBUS_MAJOR_VERSION}.${DBUS_MINOR_VERSION}.${DBUS_MICRO_VERSION})