Merge branch 'release/1.4.0' into develop

* release/1.4.0: Revert docs directory addition (not ready yet) Update version numbers (1.4.0, SOVER 2.3.0)
zerotao · Apr 9, 2012 · d6d5bf9 · d6d5bf9
2 parents 5c07ca9 + 03d2fdf
commit d6d5bf9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 
 project(libzt)
-set(PROJECT_VERSION 1.3.3)
+set(PROJECT_VERSION 1.4.0)
 
 # set(CMAKE_VERBOSE_MAKEFILE ON)
 
@@ -122,4 +122,4 @@ add_subdirectory(tools)
 add_subdirectory(src)
 add_subdirectory(examples)
 add_subdirectory(tests)
-add_subdirectory(docs)
+add_subdirectory(doc)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -81,7 +81,7 @@ add_library(zt_unit ${zt_unit_SRCS})
 target_link_libraries(zt_unit zt) # needed to resolve undefined symbols in shared libs
 
 if(BUILD_SHARED_LIBS)
-    set_target_properties(zt PROPERTIES VERSION 2.2.0 SOVERSION 3)
+    set_target_properties(zt PROPERTIES VERSION 2.3.0 SOVERSION 3)
     set_target_properties(zt_gc PROPERTIES VERSION 2.0.0 SOVERSION 1)
     set_target_properties(zt_unit PROPERTIES VERSION 2.0.0 SOVERSION 2)
 endif(BUILD_SHARED_LIBS)