[geos-commits] r3485 - in branches/3.3: . capi src

svn_geos at osgeo.org svn_geos at osgeo.org
Fri Sep 23 11:59:12 EDT 2011


Author: strk
Date: 2011-09-23 08:59:11 -0700 (Fri, 23 Sep 2011)
New Revision: 3485

Modified:
   branches/3.3/NEWS
   branches/3.3/capi/CMakeLists.txt
   branches/3.3/src/CMakeLists.txt
Log:
Fix OS X framework cmake build (#385) -- thanks kyngchaos


Modified: branches/3.3/NEWS
===================================================================
--- branches/3.3/NEWS	2011-09-23 12:14:53 UTC (rev 3484)
+++ branches/3.3/NEWS	2011-09-23 15:59:11 UTC (rev 3485)
@@ -12,6 +12,7 @@
   - Fix Geometry::clone to copy SRID (#464)
   - Fix for clang builds (#463)
   - Fix out-of-place build for python binding (#332)
+  - Fix OS X framework cmake build (#385)
 
 Changes in 3.3.0
 2011-05-30

Modified: branches/3.3/capi/CMakeLists.txt
===================================================================
--- branches/3.3/capi/CMakeLists.txt	2011-09-23 12:14:53 UTC (rev 3484)
+++ branches/3.3/capi/CMakeLists.txt	2011-09-23 15:59:11 UTC (rev 3485)
@@ -33,13 +33,13 @@
     PROPERTIES
     VERSION ${CAPI_VERSION}
     CLEAN_DIRECT_OUTPUT 1)
-endif()
 
 if(APPLE) 
   set_target_properties(geos PROPERTIES 
   BUILD_WITH_INSTALL_RPATH TRUE 
   INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}") 
 endif() 
+endif() 
 
 #################################################################################
 # Installation

Modified: branches/3.3/src/CMakeLists.txt
===================================================================
--- branches/3.3/src/CMakeLists.txt	2011-09-23 12:14:53 UTC (rev 3484)
+++ branches/3.3/src/CMakeLists.txt	2011-09-23 15:59:11 UTC (rev 3485)
@@ -78,14 +78,14 @@
     PREFIX "lib"
     CLEAN_DIRECT_OUTPUT 1)
 
-endif()
-
 if(APPLE)
   set_target_properties(geos
     PROPERTIES
     BUILD_WITH_INSTALL_RPATH TRUE
     INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}")
+
 endif()
+endif()
 
 #################################################################################
 # Installation



More information about the geos-commits mailing list