[geos-commits] r2887 - in trunk: . capi src

[svn_geos at osgeo.org]

Author: mloskot
Date: 2010-01-22 21:36:31 -0500 (Fri, 22 Jan 2010)
New Revision: 2887

Modified:
   trunk/CMakeLists.txt
   trunk/capi/CMakeLists.txt
   trunk/src/CMakeLists.txt
Log:
CMake configuration update (#317): * Configured shared library target for C++ API. * Added library version information and TODO comment about SOVERSION.

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2010-01-23 01:38:50 UTC (rev 2886)
+++ trunk/CMakeLists.txt	2010-01-23 02:36:31 UTC (rev 2887)
@@ -217,6 +217,6 @@
 
 #################################################################################
 # DEBUG settings - TODO: make a summary
-message(STATUS "XXX: CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}")
-message(STATUS "XXX: CMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}")
-message(STATUS "XXX: CMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}")
+#message(STATUS "XXX: CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}")
+#message(STATUS "XXX: CMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}")
+#message(STATUS "XXX: CMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}")

Modified: trunk/capi/CMakeLists.txt
===================================================================
--- trunk/capi/CMakeLists.txt	2010-01-23 01:38:50 UTC (rev 2886)
+++ trunk/capi/CMakeLists.txt	2010-01-23 02:36:31 UTC (rev 2887)
@@ -24,6 +24,9 @@
 
 target_link_libraries(geos_c geos)
 
+# TODO: Enable SOVERSION property
+set_target_properties(geos_c PROPERTIES VERSION ${CAPI_VERSION})
+
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/geos_c.h
   DESTINATION include/geos)
 

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2010-01-23 01:38:50 UTC (rev 2886)
+++ trunk/src/CMakeLists.txt	2010-01-23 02:36:31 UTC (rev 2887)
@@ -14,8 +14,16 @@
 
 file(GLOB_RECURSE geos_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
-add_library(geos STATIC ${geos_SOURCES})
+add_library(geos SHARED ${geos_SOURCES})
+add_library(geos-static STATIC ${geos_SOURCES})
 
+set_target_properties(geos-static PROPERTIES OUTPUT_NAME "geos")
+set_target_properties(geos PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+set_target_properties(geos-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+
+# TODO: Enable SOVERSION property
+set_target_properties(geos PROPERTIES VERSION ${VERSION})
+
 install(TARGETS geos
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib