[geos-commits] r2865 - in trunk: . include src

svn_geos at osgeo.org svn_geos at osgeo.org
Sun Jan 17 18:06:27 EST 2010


Author: mloskot
Date: 2010-01-17 18:06:26 -0500 (Sun, 17 Jan 2010)
New Revision: 2865

Added:
   trunk/include/CMakeLists.txt
Modified:
   trunk/CMakeLists.txt
   trunk/src/CMakeLists.txt
Log:
Configured 'make install' target for GEOS C++ static library archive and headers (#317)

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2010-01-17 03:21:21 UTC (rev 2864)
+++ trunk/CMakeLists.txt	2010-01-17 23:06:26 UTC (rev 2865)
@@ -136,7 +136,7 @@
 # Configure subdirectories
 #################################################################################
 
+add_subdirectory(include)
 add_subdirectory(src)
 add_subdirectory(capi)
 add_subdirectory(tests)
-

Added: trunk/include/CMakeLists.txt
===================================================================
--- trunk/include/CMakeLists.txt	                        (rev 0)
+++ trunk/include/CMakeLists.txt	2010-01-17 23:06:26 UTC (rev 2865)
@@ -0,0 +1,22 @@
+#################################################################################
+# $Id$
+#
+# GEOS C++ library build configuration for CMake build system
+#
+# Copyright (C) 2009 Mateusz Loskot <mateusz at loskot.net>
+#
+# This is free software; you can redistribute and/or modify it under
+# the terms of the GNU Lesser General Public Licence as published
+# by the Free Software Foundation. 
+# See the COPYING file for more information.
+#
+#################################################################################
+
+install(FILES geos.h DESTINATION include/geos)
+
+install(DIRECTORY geos/
+  DESTINATION include/geos
+  FILES_MATCHING
+  PATTERN "*.h"
+  PATTERN "*.inl"
+  PATTERN ".svn" EXCLUDE)

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2010-01-17 03:21:21 UTC (rev 2864)
+++ trunk/src/CMakeLists.txt	2010-01-17 23:06:26 UTC (rev 2865)
@@ -15,3 +15,8 @@
 file(GLOB_RECURSE geos_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
 add_library(geos STATIC ${geos_SOURCES})
+
+install(TARGETS geos
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib)



More information about the geos-commits mailing list