diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2011-12-21 20:42:21 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2011-12-21 20:42:21 +0100 |
| commit | 66a4f22841bd4fc942eb9cfac7aaf17577e0bd56 (patch) | |
| tree | c8d05e60a40733318b6739141a498c90618e292d /cmake/CMakeLists.txt | |
| parent | c4e5c2ec7a9d2dd4fc058e5cef73aaa37f890073 (diff) | |
| parent | ef8d0d75d538db543ab0ff68809656f3972e3848 (diff) | |
| download | dbus-66a4f22841bd4fc942eb9cfac7aaf17577e0bd56.tar.gz | |
Merge branch 'dbus-1.4'
Diffstat (limited to 'cmake/CMakeLists.txt')
| -rw-r--r-- | cmake/CMakeLists.txt | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 9db47381..ba44d575 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -1,18 +1,5 @@ project(dbus) -######################################################################### -# 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}) - -set (DBUS_VERSION_STRING "${DBUS_VERSION}") - # we need to be up to date CMAKE_MINIMUM_REQUIRED(VERSION 2.4.4 FATAL_ERROR) if(COMMAND cmake_policy) @@ -22,6 +9,12 @@ endif(COMMAND cmake_policy) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules") +# detect version +include(MacrosAutotools) +autoversion(../configure.ac dbus) +# used by file version info +set (DBUS_PATCH_VERSION "0") + include(Macros) TIMESTAMP(DBUS_BUILD_TIMESTAMP) |