[geos-commits] r3223 - in trunk: capi src

[svn_geos at osgeo.org]

Author: mloskot
Date: 2011-02-18 10:25:32 -0800 (Fri, 18 Feb 2011)
New Revision: 3223

Modified:
   trunk/capi/CMakeLists.txt
   trunk/src/CMakeLists.txt
Log:
Updated CMake configuration to use libgeos.lib for static library and geos.lib for import library. Define GEOS_DLL_EXPORT for GEOS DLL target.

Modified: trunk/capi/CMakeLists.txt
===================================================================
--- trunk/capi/CMakeLists.txt	2011-02-15 17:35:14 UTC (rev 3222)
+++ trunk/capi/CMakeLists.txt	2011-02-18 18:25:32 UTC (rev 3223)
@@ -25,7 +25,10 @@
 target_link_libraries(geos_c geos)
 
 # TODO: Enable SOVERSION property
-set_target_properties(geos_c PROPERTIES VERSION ${CAPI_VERSION})
+set_target_properties(geos_c
+  PROPERTIES
+  VERSION ${CAPI_VERSION}
+  CLEAN_DIRECT_OUTPUT 1)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/geos_c.h
   DESTINATION include)

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2011-02-15 17:35:14 UTC (rev 3222)
+++ trunk/src/CMakeLists.txt	2011-02-18 18:25:32 UTC (rev 3223)
@@ -17,13 +17,19 @@
 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})
+set_target_properties(geos
+  PROPERTIES
+  DEFINE_SYMBOL GEOS_DLL_EXPORT
+  VERSION ${VERSION}
+  CLEAN_DIRECT_OUTPUT 1)
 
+set_target_properties(geos-static
+  PROPERTIES
+  OUTPUT_NAME "geos"
+  PREFIX "lib"
+  CLEAN_DIRECT_OUTPUT 1)
+
 install(TARGETS geos geos-static
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib