diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | cmake/CMakeLists.txt | 16 |
2 files changed, 17 insertions, 4 deletions
@@ -1,5 +1,10 @@ 2007-06-21 Ralf Habacker <ralf.habacker@freenet.de> + * cmake/CMakeLists.txt: added VERSION_PATCH to be able to + distinguish win32 binary release from dbus versioning + +2007-06-21 Ralf Habacker <ralf.habacker@freenet.de> + * dbus/dbus-sysdeps-win.c: deleted local DBusCredentials structure (_dbus_getsid): new function (_dbus_read_credentials_socket): used correct function diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 776c6abc..5482c5d3 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -1,8 +1,16 @@ set (PACKAGE dbus) + +# the version major, minor and release number should be synchron to the dbus cvs - windows releases should only update the patch level set (VERSION_MAJOR "1") set (VERSION_MINOR "1") -set (VERSION_PATCH "0") -set (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} ) +set (VERSION_RELEASE "1") +set (VERSION_PATCH "2") +if (VERSION_PATCH) + set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}-${VERSION_PATCH}" ) +else (VERSION_PATCH) + set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}" ) +endif (VERSION_PATCH) + project(${PACKAGE}) # we need to be up to date @@ -85,8 +93,8 @@ endif(MSVC) if(CMAKE_BUILD_TYPE STREQUAL "Debug") # used by executables, CMAKE_DEBUG_POSTFIX does not handle this case - set (CMAKE_EXE_POSTFIX "d") - set (CMAKE_DEBUG_POSTFIX "d") + #set (CMAKE_EXE_POSTFIX "d") + #set (CMAKE_DEBUG_POSTFIX "d") endif(CMAKE_BUILD_TYPE STREQUAL "Debug") ######################################################################### |