avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dcrea...@apache.org
Subject svn commit: r1236181 - in /avro/trunk: CHANGES.txt lang/c/CMakeLists.txt
Date Thu, 26 Jan 2012 13:59:22 GMT
Author: dcreager
Date: Thu Jan 26 13:59:22 2012
New Revision: 1236181

URL: http://svn.apache.org/viewvc?rev=1236181&view=rev
Log:
AVRO-1003. C: Fix pkg-config file when codecs are missing.

If either of the zlib or lzma/xz libraries are missing, then we need to
ensure that the corresponding substitution variable in our pkg-config
file gets an empty value.  Otherwise CMake leaves the variable
unsubstituted, which gives us an invalid pkg-config file.

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=1236181&r1=1236180&r2=1236181&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Thu Jan 26 13:59:22 2012
@@ -77,6 +77,9 @@ Avro 1.6.2 (unreleased)
 
     AVRO-1002. Fix a broken link in the specification. (cutting)
 
+    AVRO-1003. C: Fix pkg-config file when codecs are missing.
+    (dcreager)
+
 Avro 1.6.1 (8 November 2011)
 
   INCOMPATIBLE CHANGES

Modified: avro/trunk/lang/c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c/CMakeLists.txt?rev=1236181&r1=1236180&r2=1236181&view=diff
==============================================================================
--- avro/trunk/lang/c/CMakeLists.txt (original)
+++ avro/trunk/lang/c/CMakeLists.txt Thu Jan 26 13:59:22 2012
@@ -101,6 +101,7 @@ if (ZLIB_FOUND)
     include_directories(${ZLIB_INCLUDE_DIR})
     message("Enabled deflate codec")
 else (ZLIB_FOUND)
+    set(ZLIB_PKG "")
     message("Disabled deflate codec. zlib not found.")
 endif (ZLIB_FOUND)
 
@@ -113,6 +114,7 @@ if (LZMA_FOUND)
     link_directories(${LZMA_LIBRARY_DIRS})
     message("Enabled lzma codec")
 else (LZMA_FOUND)
+    set(LZMA_PKG "")
     message("Disabled lzma codec. liblzma not found.")
 endif (LZMA_FOUND)
 



Mime
View raw message