svn commit: r1129729 - in /avro/trunk: CHANGES.txt lang/c/src/CMakeLists.txt lang/c/version.sh

[dc...@apache.org]

Author: dcreager
Date: Tue May 31 15:00:25 2011
New Revision: 1129729

URL: http://svn.apache.org/viewvc?rev=1129729&view=rev
Log:
AVRO-469. C: Use soversion in CMake build scripts

The CMake build scripts now set the soversion of the generated library
correctly.  The version.sh script defines the libtool-style version
number to use for the library.  It hadn't been updated in awhile, so
I've also bumped the soversion number to reset at a new
binary-incompatible library version number.

Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/lang/c/src/CMakeLists.txt
    avro/trunk/lang/c/version.sh

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1129729&r1=1129728&r2=1129729&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Tue May 31 15:00:25 2011
@@ -24,6 +24,9 @@ Avro 1.5.2 (unreleased)
 
   IMPROVEMENTS
 
+    AVRO-469. C: Set library's libtool-style soversion when using CMake
+    build scripts. (dcreager)
+
     AVRO-470. C: Build asciidoc documentation when using CMake build
     scripts. (Daniel Lundin via dcreager)
 

Modified: avro/trunk/lang/c/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c/src/CMakeLists.txt?rev=1129729&r1=1129728&r2=1129729&view=diff
==============================================================================
--- avro/trunk/lang/c/src/CMakeLists.txt (original)
+++ avro/trunk/lang/c/src/CMakeLists.txt Tue May 31 15:00:25 2011
@@ -67,12 +67,17 @@ set(JANSSON_SRC
 source_group(Avro FILES ${AVRO_SRC})
 source_group(Jansson FILES ${JANSSON_SRC})
 
+# The version.sh script gives us a SOVERSION that uses colon as a
+# separator; we need periods.
+
+string(REPLACE ":" "." LIBAVRO_DOT_VERSION ${LIBAVRO_VERSION})
+
 add_library(avro-static STATIC ${AVRO_SRC} ${JANSSON_SRC})
 set_target_properties(avro-static PROPERTIES OUTPUT_NAME avro)
 add_library(avro-shared SHARED ${AVRO_SRC} ${JANSSON_SRC})
 set_target_properties(avro-shared PROPERTIES
         OUTPUT_NAME avro
-        SOVERSION ${AVRO_VERSION})
+        SOVERSION ${LIBAVRO_DOT_VERSION})
 
 install(FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/avro.h

Modified: avro/trunk/lang/c/version.sh
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c/version.sh?rev=1129729&r1=1129728&r2=1129729&view=diff
==============================================================================
--- avro/trunk/lang/c/version.sh (original)
+++ avro/trunk/lang/c/version.sh Tue May 31 15:00:25 2011
@@ -18,7 +18,7 @@
 #         libavro_binary_age = 0
 #         libavro_interface_age = 0
 #
-libavro_micro_version=21
+libavro_micro_version=22
 libavro_interface_age=0
 libavro_binary_age=0