--- ./CMakeLists.txt.org	2010-01-10 09:07:32.000000000 +0900
+++ ./CMakeLists.txt	2010-09-29 21:55:09.000000000 +0900
@@ -6,3 +6,6 @@
 
 add_subdirectory(src)
 
+install(DIRECTORY html DESTINATION share/doc/qhull)
+install(FILES html/qhull.man DESTINATION share/man/man1 RENAME qhull.1)
+install(FILES html/rbox.man DESTINATION share/man/man1 RENAME rbox.1)
--- ./src/CMakeLists.txt.org	2010-01-10 09:07:32.000000000 +0900
+++ ./src/CMakeLists.txt	2010-09-29 21:55:45.000000000 +0900
@@ -1,5 +1,10 @@
 project(qhull_lib)
 
+# Change before each release whenever there has been an API change of any
+# kind.
+set(qhull_SOVERSION 5)
+set(qhull_VERSION ${qhull_SOVERSION}.0.0)
+
 # Order object files by frequency of execution.  Small files at end.
 set(
     qhull_src
@@ -23,8 +28,23 @@
 
 file(GLOB qhull_hdr *.h)
 
-add_library(qhull ${qhull_src})
+add_library(qhull SHARED ${qhull_src})
 target_link_libraries(qhull m)
+set_target_properties(qhull PROPERTIES 
+	SOVERSION ${qhull_SOVERSION} VERSION ${qhull_VERSION})
+if(UNIX)
+	if(APPLE)
+		set_target_properties(qhull PROPERTIES 
+			INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+	else(APPLE)
+		set_target_properties(qhull PROPERTIES 
+			INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
+			INSTALL_RPATH_USE_LINK_PATH TRUE
+			BUILD_WITH_INSTALL_RPATH FALSE)
+	endif(APPLE)
+endif(UNIX)
+add_library(qhullstatic STATIC ${qhull_src})
+set_property(TARGET qhullstatic PROPERTY OUTPUT_NAME "qhull")
 
 set(qhullcmd_SOURCES  unix.c)
 set(rbox_SOURCES  rbox.c)
@@ -33,22 +53,16 @@
 set(qvoronoi_SOURCES  qvoronoi.c)
 set(qhalf_SOURCES  qhalf.c)
 
-
-add_executable(qhullcmd ${qhullcmd_SOURCES})
-target_link_libraries(qhullcmd qhull)
-
-add_executable(rbox ${rbox_SOURCES})
-target_link_libraries(rbox qhull)
-
-add_executable(qconvex ${qconvex_SOURCES})
-target_link_libraries(qconvex qhull)
-
-add_executable(qdelaunay ${qdelaunay_SOURCES})
-target_link_libraries(qdelaunay qhull)
-
-add_executable(qvoronoi ${qvoronoi_SOURCES})
-target_link_libraries(qvoronoi qhull)
-
-add_executable(qhalf ${qhalf_SOURCES})
-target_link_libraries(qhalf qhull)
-
+set(PROGS qhullcmd rbox qconvex qdelaunay qvoronoi qhalf)
+foreach(PROG ${PROGS})
+	add_executable(${PROG} ${${PROG}_SOURCES})
+	target_link_libraries(${PROG} qhull)
+endforeach(PROG ${PROGS})
+
+set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull")
+
+install(TARGETS qhull qhullstatic ${PROGS}
+	RUNTIME DESTINATION bin
+	LIBRARY DESTINATION lib
+	ARCHIVE DESTINATION lib)
+install(FILES ${qhull_hdr} DESTINATION include/qhull)