[geos-commits] r3698 - in branches/3.3: . cmake include src

[svn_geos at osgeo.org]

Author: mloskot
Date: 2012-06-26 13:42:15 -0700 (Tue, 26 Jun 2012)
New Revision: 3698

Modified:
   branches/3.3/CMakeLists.txt
   branches/3.3/cmake/cmake_uninstall.cmake.in
   branches/3.3/include/CMakeLists.txt
   branches/3.3/src/CMakeLists.txt
Log:
[CMake] Merged recent fixes from trunk. Updated version numbers according to configure.in

Modified: branches/3.3/CMakeLists.txt
===================================================================
--- branches/3.3/CMakeLists.txt	2012-06-26 20:41:23 UTC (rev 3697)
+++ branches/3.3/CMakeLists.txt	2012-06-26 20:42:15 UTC (rev 3698)
@@ -1,5 +1,4 @@
 #################################################################################
-# $Id$
 #
 # Main GEOS build configuration file for CMake build system
 #
@@ -30,7 +29,7 @@
 # GEOS C++ library SONAME will use these encoding ABI break at every release
 set(VERSION_MAJOR 3)
 set(VERSION_MINOR 3)
-set(VERSION_PATCH 2dev)
+set(VERSION_PATCH 6dev)
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # JTS_PORT is the version of JTS this release is bound to
@@ -39,7 +38,7 @@
 
 # GEOS C API version
 set(CAPI_INTERFACE_CURRENT 8)
-set(CAPI_INTERFACE_REVISION 2)
+set(CAPI_INTERFACE_REVISION 6)
 set(CAPI_INTERFACE_AGE 7)
 
 math(EXPR CAPI_VERSION_MAJOR "${CAPI_INTERFACE_CURRENT} - ${CAPI_INTERFACE_AGE}")
@@ -47,6 +46,10 @@
 set(CAPI_VERSION_PATCH ${CAPI_INTERFACE_REVISION})
 set(CAPI_VERSION "${CAPI_VERSION_MAJOR}.${CAPI_VERSION_MINOR}.${CAPI_VERSION_PATCH}")
 message(STATUS "Setting GEOS C API version ${CAPI_VERSION}")
+if (NOT WIN32)
+  set(CAPI_SOVERSION ${CAPI_VERSION_MAJOR})
+  message(STATUS "Setting GEOS C API soversion ${CAPI_SOVERSION}")
+endif()
 
 #################################################################################
 # Check custom global options
@@ -70,7 +73,7 @@
 
 if(APPLE)
   option(GEOS_ENABLE_MACOSX_FRAMEWORK
-    "Set to OFF|ON (default) to build GEOS as a Mac OS X framework" ON)
+    "Set to ON|OFF (default) to build GEOS as a Mac OS X framework" OFF)
   option(GEOS_ENABLE_MACOSX_FRAMEWORK_UNIXCOMPAT
     "Set to ON|OFF (default) to add Unix compatibility to the Mac OS X framework" OFF)
 endif()

Modified: branches/3.3/cmake/cmake_uninstall.cmake.in
===================================================================
--- branches/3.3/cmake/cmake_uninstall.cmake.in	2012-06-26 20:41:23 UTC (rev 3697)
+++ branches/3.3/cmake/cmake_uninstall.cmake.in	2012-06-26 20:42:15 UTC (rev 3698)
@@ -1,5 +1,4 @@
 #################################################################################
-# $Id: CMakeLists.txt 2920 2010-02-21 17:11:38Z mloskot $
 #
 # This file is a part of CMake build configuration of GEOS library
 #

Modified: branches/3.3/include/CMakeLists.txt
===================================================================
--- branches/3.3/include/CMakeLists.txt	2012-06-26 20:41:23 UTC (rev 3697)
+++ branches/3.3/include/CMakeLists.txt	2012-06-26 20:42:15 UTC (rev 3698)
@@ -1,5 +1,4 @@
 #################################################################################
-# $Id$
 #
 # GEOS C++ library build configuration for CMake build system
 #

Modified: branches/3.3/src/CMakeLists.txt
===================================================================
--- branches/3.3/src/CMakeLists.txt	2012-06-26 20:41:23 UTC (rev 3697)
+++ branches/3.3/src/CMakeLists.txt	2012-06-26 20:42:15 UTC (rev 3698)
@@ -1,5 +1,4 @@
 #################################################################################
-# $Id$
 #
 # GEOS C++ library build configuration for CMake build system
 #
@@ -15,7 +14,7 @@
 file(GLOB_RECURSE geos_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 file(GLOB_RECURSE geos_ALL_HEADERS ${CMAKE_SOURCE_DIR}/include/*.h) # fix source_group issue
 
-if(APPLE AND GEOS_ENABLE_MACOSX_FRAMEWORK)
+if(GEOS_ENABLE_MACOSX_FRAMEWORK)
   # OS X frameworks don't have static libs
   # also 1 binary, so include CAPI here
   # and, make name all caps
@@ -65,7 +64,6 @@
   add_library(geos SHARED ${geos_SOURCES} ${geos_ALL_HEADERS})
   add_library(geos-static STATIC ${geos_SOURCES} ${geos_ALL_HEADERS})
 
-# TODO: Enable SOVERSION property
   set_target_properties(geos
     PROPERTIES
     DEFINE_SYMBOL GEOS_DLL_EXPORT
@@ -78,20 +76,20 @@
     PREFIX "lib"
     CLEAN_DIRECT_OUTPUT 1)
 
-if(APPLE)
-  set_target_properties(geos
-    PROPERTIES
-    BUILD_WITH_INSTALL_RPATH TRUE
-    INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}")
-
 endif()
-endif()
 
+# if(APPLE)
+#   set_target_properties(geos
+#     PROPERTIES
+#     BUILD_WITH_INSTALL_RPATH TRUE
+#     INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}")
+# endif()
+
 #################################################################################
 # Installation
 #################################################################################
 
-if(NOT APPLE AND NOT GEOS_ENABLE_MACOSX_FRAMEWORK)
+if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK)
   install(TARGETS geos geos-static
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib