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

[svn_geos at osgeo.org]

Author: hobu
Date: 2011-10-04 08:42:49 -0700 (Tue, 04 Oct 2011)
New Revision: 3493

Modified:
   trunk/capi/CMakeLists.txt
   trunk/src/CMakeLists.txt
Log:
fix up non-framework CMake builds on APPLE

Modified: trunk/capi/CMakeLists.txt
===================================================================
--- trunk/capi/CMakeLists.txt	2011-10-04 15:32:23 UTC (rev 3492)
+++ trunk/capi/CMakeLists.txt	2011-10-04 15:42:49 UTC (rev 3493)
@@ -21,7 +21,7 @@
 
 file(GLOB geos_capi_HEADERS ${CMAKE_BINARY_DIR}/capi/*.h) # fix source_group issue
 
-if(NOT APPLE AND NOT GEOS_ENABLE_MACOSX_FRAMEWORK) 
+if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK) 
   # if building OS X framework, CAPI built into C++ library 
   add_library(geos_c SHARED ${geos_c_SOURCES}) 
 
@@ -34,12 +34,6 @@
     CLEAN_DIRECT_OUTPUT 1)
 endif()
 
-if(APPLE) 
-  set_target_properties(geos PROPERTIES 
-  BUILD_WITH_INSTALL_RPATH TRUE 
-  INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}") 
-endif() 
-
 #################################################################################
 # Installation
 #################################################################################
@@ -53,7 +47,7 @@
     DESTINATION include)
 endif()
 
-if(NOT APPLE AND NOT GEOS_ENABLE_MACOSX_FRAMEWORK) 
+if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK) 
   install(TARGETS geos_c
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2011-10-04 15:32:23 UTC (rev 3492)
+++ trunk/src/CMakeLists.txt	2011-10-04 15:42:49 UTC (rev 3493)
@@ -14,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
@@ -79,18 +79,18 @@
 
 endif()
 
-if(APPLE)
-  set_target_properties(geos
-    PROPERTIES
-    BUILD_WITH_INSTALL_RPATH TRUE
-    INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}")
-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