changes in 1.0.10

lloyd · Jul 20, 2010 · 62b29b1 · 62b29b1
1 parent 4048a6b
commit 62b29b1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,14 +38,9 @@ SET (YAJL_MICRO 10)
 
 SET (YAJL_DIST_NAME "yajl-${YAJL_MAJOR}.${YAJL_MINOR}.${YAJL_MICRO}")
 
-# RPATH handling.  When YAJL_RPATH_PREFIX cmake var is set, we'll use that
-# base for rpath instead of CMAKE_INSTALL_PREFIX
-IF (YAJL_RPATH_PREFIX)
-  SET(CMAKE_SKIP_BUILD_RPATH  TRUE)
-  SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
-  SET(CMAKE_INSTALL_RPATH "${YAJL_RPATH_PREFIX}/lib")
-  SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-ENDIF (YAJL_RPATH_PREFIX)
+# RPATH handling -- given we statically link, we'll turn off
+# unnec. rpath embedding
+SET(CMAKE_SKIP_RPATH  TRUE)
 
 IF (NOT CMAKE_BUILD_TYPE)
   SET(CMAKE_BUILD_TYPE "Release")

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+1.0.10
+     * Brian Maher - yajl is now buildable without a c++ compiler present
+     * Brian Maher - fix header installation on OSX with cmake 2.8.0 installed
+     * lth & vitali - allow builder to specify alternate lib directory
+	for installation (i.e. lib64) 
+     * Vitali Lovich - yajl version number now programatically accessible
+     * lth - prevent cmake from embedding rpaths in binaries.  Static linking
+	makes this unneccesary.
+
 1.0.9
      * lth - fix inverted logic causing yajl_gen_double() to always fail on
 	win32 (thanks to Fredrik Kihlander for the report)