summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-05-02 10:43:01 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-05-02 10:43:01 (GMT)
commit5bfe0419d628bd2a62f783ca81645a61f7097451 (patch)
tree2f8b20a43080ba1938340de9acf5db54db01710c
parent0caa450eab8d264403f18c9c0a6c5655fb68a0a7 (diff)
downloadlibkolabxml-5bfe0419d628bd2a62f783ca81645a61f7097451.tar.gz
Increased development version to 0.5
-rw-r--r--CMakeLists.txt19
-rw-r--r--README4
2 files changed, 18 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8afffc..53eaa8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,10 +24,23 @@ if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7 AND
cmake_policy(SET CMP0017 NEW)
endif()
+# Versioning
+# x.y.z scheme
+# Development versions are only x.y
+#
+# i.e.
+# 0.1 (0.1 development version)
+# 0.1.0 (first release)
+# 0.1.1 (patch release for 0.1.0)
+# 0.2 (0.2 development version)
+
set (Libkolabxml_VERSION_MAJOR 0)
-set (Libkolabxml_VERSION_MINOR 4)
-set (Libkolabxml_VERSION_PATCH 0)
-set (Libkolabxml_VERSION "${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}.${Libkolabxml_VERSION_PATCH}" )
+set (Libkolabxml_VERSION_MINOR 5)
+# Enable the full x.y.z version only for release versions
+# set (Libkolabxml_VERSION_PATCH 0)
+# set (Libkolabxml_VERSION "${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}.${Libkolabxml_VERSION_PATCH}" )
+set (Libkolabxml_VERSION "${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}" )
+
set (Libkolabxml_VERSION_STRING ${CMAKE_PROJECT_NAME}-${Libkolabxml_VERSION})
set (KOLAB_FORMAT_VERSION "3.0dev1")
diff --git a/README b/README
index ef73480..ab66976 100644
--- a/README
+++ b/README
@@ -29,8 +29,8 @@ CSHARP_INSTALL_DIR
=== Example ===
-Find libraries in lib64, install to lib64, build python and phpbindings:
-$cmake -DCMAKE_PREFIX_PATH=/usr/lib64 -DLIB_INSTALL_DIR_SUFFIX=64 -DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=/usr/local/pythonbindings -DPHP_BINDINGS=TRUE ..
+Find libraries in lib64, install to /usr/lib64, build python and phpbindings:
+$cmake -DCMAKE_PREFIX_PATH=/usr/lib64 -DCMAKE_INSTALL_PREFIX=/usr -DLIB_INSTALL_DIR_SUFFIX=64 -DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=/usr/local/pythonbindings -DPHP_BINDINGS=TRUE ..
== Requirements ==