avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From th...@apache.org
Subject svn commit: r1180563 - in /avro/trunk: CHANGES.txt lang/c++/CMakeLists.txt
Date Sun, 09 Oct 2011 08:19:05 GMT
Author: thiru
Date: Sun Oct  9 08:19:05 2011
New Revision: 1180563

URL: http://svn.apache.org/viewvc?rev=1180563&view=rev
Log:
AVRO-908. Add an option to build avrocpp as a static library

Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/lang/c++/CMakeLists.txt

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1180563&r1=1180562&r2=1180563&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Sun Oct  9 08:19:05 2011
@@ -33,6 +33,8 @@ Avro 1.6.0 (unreleased)
     structures to be written and read from Avro-format data files.
     (cutting)
 
+    AVRO-908. Add an option to build avrocpp as a static library. (Nebojsa Sabovic via thiru)
+
   OPTIMIZATIONS
 
     AVRO-853: Java: Cache Schema hash codes. (cutting)

Modified: avro/trunk/lang/c++/CMakeLists.txt
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c%2B%2B/CMakeLists.txt?rev=1180563&r1=1180562&r2=1180563&view=diff
==============================================================================
--- avro/trunk/lang/c++/CMakeLists.txt (original)
+++ avro/trunk/lang/c++/CMakeLists.txt Sun Oct  9 08:19:05 2011
@@ -39,7 +39,7 @@ find_package (Boost 1.38 REQUIRED
 
 include_directories (api ${BUILD_DIRECTORY} ${Boost_INCLUDE_DIRS})
 
-add_library (avrocpp SHARED
+set (SOURCE_FILES
         impl/Compiler.cc impl/CompilerNode.cc impl/Node.cc
         impl/NodeImpl.cc impl/Resolver.cc impl/ResolverSchema.cc impl/Schema.cc
         impl/Types.cc impl/Validator.cc impl/ValidSchema.cc impl/Zigzag.cc
@@ -53,6 +53,10 @@ add_library (avrocpp SHARED
         impl/parsing/ResolvingDecoder.cc
         ${BUILD_DIRECTORY}/AvroYacc.cc ${BUILD_DIRECTORY}/AvroLex.cc)
 
+add_library (avrocpp SHARED ${SOURCE_FILES})
+
+add_library (avrocpp_s ${SOURCE_FILES})
+
 target_link_libraries (avrocpp ${Boost_LIBRARIES})
 
 add_executable (precompile test/precompile.cc)
@@ -163,7 +167,7 @@ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${
 
 include (CPack)
 
-install(TARGETS avrocpp
+install(TARGETS avrocpp avrocpp_s
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib
     RUNTIME DESTINATION lib)



Mime
View raw message