svn commit: r1180027 - in /avro/trunk: CHANGES.txt lang/c++/CMakeLists.txt

[th...@apache.org]

Author: thiru
Date: Fri Oct  7 12:51:26 2011
New Revision: 1180027

URL: http://svn.apache.org/viewvc?rev=1180027&view=rev
Log:
AVRO-902. C++/CMake installs into /usr/local/local/

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=1180027&r1=1180026&r2=1180027&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Fri Oct  7 12:51:26 2011
@@ -125,6 +125,8 @@ Avro 1.6.0 (unreleased)
 
     AVRO-904. C++/CMake build should fail if Boost libraries are not present. (Nebojsa Sabovic via thiru)
 
+    AVRO-902. C++/CMake installs into /usr/local/local/.  (Nebojsa Sabovic via thiru)
+
 Avro 1.5.4 (12 September 2011)
 
   IMPROVEMENTS

Modified: avro/trunk/lang/c++/CMakeLists.txt
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c%2B%2B/CMakeLists.txt?rev=1180027&r1=1180026&r2=1180027&view=diff
==============================================================================
--- avro/trunk/lang/c++/CMakeLists.txt (original)
+++ avro/trunk/lang/c++/CMakeLists.txt Fri Oct  7 12:51:26 2011
@@ -164,11 +164,11 @@ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${
 include (CPack)
 
 install(TARGETS avrocpp
-    LIBRARY DESTINATION local/lib
-    ARCHIVE DESTINATION local/lib
-    RUNTIME DESTINATION local/lib)
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+    RUNTIME DESTINATION lib)
 
-install(DIRECTORY api/ DESTINATION local/include/avro
+install(DIRECTORY api/ DESTINATION include/avro
     FILES_MATCHING PATTERN *.hh)
 
 set (CMAKE_BUILD_TYPE Release)