[geos-commits] r2866 - in trunk: . capi include

[svn_geos at osgeo.org]

Author: mloskot
Date: 2010-01-17 18:40:38 -0500 (Sun, 17 Jan 2010)
New Revision: 2866

Modified:
   trunk/CMakeLists.txt
   trunk/capi/CMakeLists.txt
   trunk/include/CMakeLists.txt
Log:
Configured 'make install' target for GEOS C shared library and headers (#317).  Install platform.h and version.h from build directory where they are installed, not from source tree. Added GEOS C API header location to include directories.

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2010-01-17 23:06:26 UTC (rev 2865)
+++ trunk/CMakeLists.txt	2010-01-17 23:40:38 UTC (rev 2866)
@@ -109,6 +109,9 @@
 # for including GEOS C++ API headers
 include_directories(${CMAKE_SOURCE_DIR}/include)
 
+# for including build-specific GEOS C API headers
+include_directories(${CMAKE_BINARY_DIR}/capi)
+
 # for including build-specific version.h, platform.h and geos_c.h
 include_directories(${CMAKE_BINARY_DIR}/include)
 
@@ -140,3 +143,7 @@
 add_subdirectory(src)
 add_subdirectory(capi)
 add_subdirectory(tests)
+
+#################################################################################
+# Setup installation of common files not specific to any targets
+#################################################################################

Modified: trunk/capi/CMakeLists.txt
===================================================================
--- trunk/capi/CMakeLists.txt	2010-01-17 23:06:26 UTC (rev 2865)
+++ trunk/capi/CMakeLists.txt	2010-01-17 23:40:38 UTC (rev 2866)
@@ -18,4 +18,12 @@
 
 add_library(geos_c SHARED ${geos_c_SOURCES})
 
-target_link_libraries(geos_c geos)
\ No newline at end of file
+target_link_libraries(geos_c geos)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/geos_c.h
+  DESTINATION include/geos)
+
+install(TARGETS geos_c
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib)

Modified: trunk/include/CMakeLists.txt
===================================================================
--- trunk/include/CMakeLists.txt	2010-01-17 23:06:26 UTC (rev 2865)
+++ trunk/include/CMakeLists.txt	2010-01-17 23:40:38 UTC (rev 2866)
@@ -12,8 +12,15 @@
 #
 #################################################################################
 
-install(FILES geos.h DESTINATION include/geos)
+install(FILES geos.h
+  DESTINATION include/geos)
 
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/geos/platform.h
+  DESTINATION include/geos)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/geos/version.h
+  DESTINATION include/geos)
+
 install(DIRECTORY geos/
   DESTINATION include/geos
   FILES_MATCHING