[geos-commits] r3384 - trunk/src
svn_geos at osgeo.org
svn_geos at osgeo.org
Mon May 30 06:45:43 EDT 2011
Author: mloskot
Date: 2011-05-30 03:45:43 -0700 (Mon, 30 May 2011)
New Revision: 3384
Modified:
trunk/src/CMakeLists.txt
Log:
Applied William\'s patch * src_CMakeLists.txt.patch Download added OSX framework (Ticket #385)
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2011-05-30 10:30:46 UTC (rev 3383)
+++ trunk/src/CMakeLists.txt 2011-05-30 10:45:43 UTC (rev 3384)
@@ -35,6 +35,8 @@
VERSION "${CVERSION}.${VERSION_MINOR}.${VERSION_PATCH}"
SOVERSION ${CVERSION}
FRAMEWORK_VERSION ${VERSION_MAJOR}
+ BUILD_WITH_INSTALL_RPATH TRUE
+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}"
MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in"
MACOSX_FRAMEWORK_BUNDLE_VERSION "GEOS ${VERSION}"
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${VERSION}
@@ -60,24 +62,31 @@
else()
-add_library(geos SHARED ${geos_SOURCES} ${geos_ALL_HEADERS})
-add_library(geos-static STATIC ${geos_SOURCES} ${geos_ALL_HEADERS})
+ 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
- VERSION ${VERSION}
- CLEAN_DIRECT_OUTPUT 1)
+ 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)
+ set_target_properties(geos-static
+ PROPERTIES
+ OUTPUT_NAME "geos"
+ 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()
+
#################################################################################
# Installation
#################################################################################
@@ -93,97 +102,96 @@
# Group source files for IDE source explorers (e.g. Visual Studio)
#################################################################################
-file(GLOB top_HEADERS ${CMAKE_SOURCE_DIR}/include/*.h)
-source_group("Header Files" FILES ${top_HEADERS})
-file(GLOB geos_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/*.h)
-source_group("Header Files\\geos" FILES ${geos_HEADERS})
-### geos/algorithm
-file(GLOB geos_algorithm_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/algorithm/*.h)
-source_group("Header Files\\geos\\algorithm" FILES ${geos_algorithm_HEADERS})
-file(GLOB geos_algorithm_distance_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/algorithm/distance/*.h)
-source_group("Header Files\\geos\\algorithm\\distance" FILES ${geos_algorithm_distance_HEADERS})
-file(GLOB geos_algorithm_locate_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/algorithm/locate/*.h)
-source_group("Header Files\\geos\\algorithm\\locate" FILES ${geos_algorithm_locate_HEADERS})
-### geos/geom
-file(GLOB geos_geom_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/geom/*.h)
-source_group("Header Files\\geos\\geom" FILES ${geos_geom_HEADERS})
-file(GLOB geos_geom_prep_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/geom/prep/*.h)
-source_group("Header Files\\geos\\geom\\prep" FILES ${geos_geom_prep_HEADERS})
-file(GLOB geos_geom_util_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/geom/util/*.h)
-source_group("Header Files\\geos\\geom\\util" FILES ${geos_geom_util_HEADERS})
-### geos/geomgraph
-file(GLOB geos_geomgraph_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/geomgraph/*.h)
-source_group("Header Files\\geos\\geomgraph" FILES ${geos_geomgraph_HEADERS})
-file(GLOB geos_geomgraph_index_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/geomgraph/index/*.h)
-source_group("Header Files\\geos\\geomgraph\\index" FILES ${geos_geomgraph_index_HEADERS})
-### geos/index
-file(GLOB geos_index_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/index/*.h)
-source_group("Header Files\\geos\\index" FILES ${geos_index_HEADERS})
-file(GLOB geos_index_bintree_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/index/bintree/*.h)
-source_group("Header Files\\geos\\index\\bintree" FILES ${geos_index_bintree_HEADERS})
-file(GLOB geos_index_chain_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/index/chain/*.h)
-source_group("Header Files\\geos\\index\\chain" FILES ${geos_index_chain_HEADERS})
-file(GLOB geos_index_intervalrtree_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/index/intervalrtree/*.h)
-source_group("Header Files\\geos\\index\\intervalrtree" FILES ${geos_index_intervalrtree_HEADERS})
-file(GLOB geos_index_quadtree_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/index/quadtree/*.h)
-source_group("Header Files\\geos\\index\\quadtree" FILES ${geos_index_quadtree_HEADERS})
-file(GLOB geos_index_strtree_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/index/strtree/*.h)
-source_group("Header Files\\geos\\index\\strtree" FILES ${geos_index_strtree_HEADERS})
-file(GLOB geos_index_sweepline_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/index/sweepline/*.h)
-source_group("Header Files\\geos\\index\\sweepline" FILES ${geos_index_sweepline_HEADERS})
-### geos/io
-file(GLOB geos_io_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/io/*.h)
-source_group("Header Files\\geos\\io" FILES ${geos_io_HEADERS})
-### geos/linearref
-file(GLOB geos_linearref_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/linearref/*.h)
-source_group("Header Files\\geos\\linearref" FILES ${geos_linearref_HEADERS})
-### geos/noding
-file(GLOB geos_noding_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/noding/*.h)
-source_group("Header Files\\geos\\noding" FILES ${geos_noding_HEADERS})
-file(GLOB geos_noding_snapround_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/noding/snapround/*.h)
-source_group("Header Files\\geos\\noding\\snapround" FILES ${geos_noding_snapround_HEADERS})
-### geos/operation
-file(GLOB geos_operation_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/*.h)
-source_group("Header Files\\geos\\operation" FILES ${geos_operation_HEADERS})
-file(GLOB geos_operation_buffer_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/buffer/*.h)
-source_group("Header Files\\geos\\operation\\buffer" FILES ${geos_operation_buffer_HEADERS})
-file(GLOB geos_operation_distance_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/distance/*.h)
-source_group("Header Files\\geos\\operation\\distance" FILES ${geos_operation_distance_HEADERS})
-file(GLOB geos_operation_linemerge_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/linemerge/*.h)
-source_group("Header Files\\geos\\operation\\linemerge" FILES ${geos_operation_linemerge_HEADERS})
-file(GLOB geos_operation_overlay_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/overlay/*.h)
-source_group("Header Files\\geos\\operation\\overlay" FILES ${geos_operation_overlay_HEADERS})
-file(GLOB geos_operation_overlay_snap_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/overlay/snap/*.h)
-source_group("Header Files\\geos\\operation\\overlay\\snap" FILES ${geos_operation_overlay_snap_HEADERS})
-file(GLOB geos_operation_overlay_validate_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/overlay/validate/*.h)
-source_group("Header Files\\geos\\operation\\overlay\\validate" FILES ${geos_operation_overlay_validate_HEADERS})
-file(GLOB geos_operation_polygonize_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/polygonize/*.h)
-source_group("Header Files\\geos\\operation\\polygonize" FILES ${geos_operation_polygonize_HEADERS})
-file(GLOB geos_operation_predicate_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/predicate/*.h)
-source_group("Header Files\\geos\\operation\\predicate" FILES ${geos_operation_predicate_HEADERS})
-file(GLOB geos_operation_relate_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/relate/*.h)
-source_group("Header Files\\geos\\operation\\relate" FILES ${geos_operation_relate_HEADERS})
-file(GLOB geos_operation_sharedpaths_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/sharedpaths/*.h)
-source_group("Header Files\\geos\\operation\\sharedpaths" FILES ${geos_operation_sharedpaths_HEADERS})
-file(GLOB geos_operation_union_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/union/*.h)
-source_group("Header Files\\geos\\operation\\union" FILES ${geos_operation_union_HEADERS})
-file(GLOB geos_operation_union_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/union/*.h)
-source_group("Header Files\\geos\\operation\\union" FILES ${geos_operation_union_HEADERS})
-file(GLOB geos_operation_valid_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/valid/*.h)
-source_group("Header Files\\geos\\operation\\valid" FILES ${geos_operation_valid_HEADERS})
-### geos/planargraph
-file(GLOB geos_planargraph_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/planargraph/*.h)
-source_group("Header Files\\geos\\planargraph" FILES ${geos_planargraph_HEADERS})
-file(GLOB geos_planargraph_algorithm_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/planargraph/algorithm/*.h)
-source_group("Header Files\\geos\\planargraph\\algorithm" FILES ${geos_planargraph_algorithm_HEADERS})
-### geso/precision
-file(GLOB geos_precision_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/precision/*.h)
-source_group("Header Files\\geos\\precision" FILES ${geos_precision_HEADERS})
-### geso/simplify
-file(GLOB geos_simplify_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/simplify/*.h)
-source_group("Header Files\\geos\\simplify" FILES ${geos_simplify_HEADERS})
-### geso/util
-file(GLOB geos_util_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/util/*.h)
-source_group("Header Files\\geos\\util" FILES ${geos_util_HEADERS})
-
-
+file(GLOB top_HEADERS ${CMAKE_SOURCE_DIR}/include/*.h)
+source_group("Header Files" FILES ${top_HEADERS})
+file(GLOB geos_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/*.h)
+source_group("Header Files\\geos" FILES ${geos_HEADERS})
+### geos/algorithm
+file(GLOB geos_algorithm_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/algorithm/*.h)
+source_group("Header Files\\geos\\algorithm" FILES ${geos_algorithm_HEADERS})
+file(GLOB geos_algorithm_distance_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/algorithm/distance/*.h)
+source_group("Header Files\\geos\\algorithm\\distance" FILES ${geos_algorithm_distance_HEADERS})
+file(GLOB geos_algorithm_locate_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/algorithm/locate/*.h)
+source_group("Header Files\\geos\\algorithm\\locate" FILES ${geos_algorithm_locate_HEADERS})
+### geos/geom
+file(GLOB geos_geom_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/geom/*.h)
+source_group("Header Files\\geos\\geom" FILES ${geos_geom_HEADERS})
+file(GLOB geos_geom_prep_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/geom/prep/*.h)
+source_group("Header Files\\geos\\geom\\prep" FILES ${geos_geom_prep_HEADERS})
+file(GLOB geos_geom_util_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/geom/util/*.h)
+source_group("Header Files\\geos\\geom\\util" FILES ${geos_geom_util_HEADERS})
+### geos/geomgraph
+file(GLOB geos_geomgraph_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/geomgraph/*.h)
+source_group("Header Files\\geos\\geomgraph" FILES ${geos_geomgraph_HEADERS})
+file(GLOB geos_geomgraph_index_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/geomgraph/index/*.h)
+source_group("Header Files\\geos\\geomgraph\\index" FILES ${geos_geomgraph_index_HEADERS})
+### geos/index
+file(GLOB geos_index_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/index/*.h)
+source_group("Header Files\\geos\\index" FILES ${geos_index_HEADERS})
+file(GLOB geos_index_bintree_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/index/bintree/*.h)
+source_group("Header Files\\geos\\index\\bintree" FILES ${geos_index_bintree_HEADERS})
+file(GLOB geos_index_chain_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/index/chain/*.h)
+source_group("Header Files\\geos\\index\\chain" FILES ${geos_index_chain_HEADERS})
+file(GLOB geos_index_intervalrtree_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/index/intervalrtree/*.h)
+source_group("Header Files\\geos\\index\\intervalrtree" FILES ${geos_index_intervalrtree_HEADERS})
+file(GLOB geos_index_quadtree_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/index/quadtree/*.h)
+source_group("Header Files\\geos\\index\\quadtree" FILES ${geos_index_quadtree_HEADERS})
+file(GLOB geos_index_strtree_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/index/strtree/*.h)
+source_group("Header Files\\geos\\index\\strtree" FILES ${geos_index_strtree_HEADERS})
+file(GLOB geos_index_sweepline_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/index/sweepline/*.h)
+source_group("Header Files\\geos\\index\\sweepline" FILES ${geos_index_sweepline_HEADERS})
+### geos/io
+file(GLOB geos_io_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/io/*.h)
+source_group("Header Files\\geos\\io" FILES ${geos_io_HEADERS})
+### geos/linearref
+file(GLOB geos_linearref_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/linearref/*.h)
+source_group("Header Files\\geos\\linearref" FILES ${geos_linearref_HEADERS})
+### geos/noding
+file(GLOB geos_noding_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/noding/*.h)
+source_group("Header Files\\geos\\noding" FILES ${geos_noding_HEADERS})
+file(GLOB geos_noding_snapround_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/noding/snapround/*.h)
+source_group("Header Files\\geos\\noding\\snapround" FILES ${geos_noding_snapround_HEADERS})
+### geos/operation
+file(GLOB geos_operation_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/*.h)
+source_group("Header Files\\geos\\operation" FILES ${geos_operation_HEADERS})
+file(GLOB geos_operation_buffer_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/buffer/*.h)
+source_group("Header Files\\geos\\operation\\buffer" FILES ${geos_operation_buffer_HEADERS})
+file(GLOB geos_operation_distance_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/distance/*.h)
+source_group("Header Files\\geos\\operation\\distance" FILES ${geos_operation_distance_HEADERS})
+file(GLOB geos_operation_linemerge_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/linemerge/*.h)
+source_group("Header Files\\geos\\operation\\linemerge" FILES ${geos_operation_linemerge_HEADERS})
+file(GLOB geos_operation_overlay_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/overlay/*.h)
+source_group("Header Files\\geos\\operation\\overlay" FILES ${geos_operation_overlay_HEADERS})
+file(GLOB geos_operation_overlay_snap_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/overlay/snap/*.h)
+source_group("Header Files\\geos\\operation\\overlay\\snap" FILES ${geos_operation_overlay_snap_HEADERS})
+file(GLOB geos_operation_overlay_validate_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/overlay/validate/*.h)
+source_group("Header Files\\geos\\operation\\overlay\\validate" FILES ${geos_operation_overlay_validate_HEADERS})
+file(GLOB geos_operation_polygonize_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/polygonize/*.h)
+source_group("Header Files\\geos\\operation\\polygonize" FILES ${geos_operation_polygonize_HEADERS})
+file(GLOB geos_operation_predicate_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/predicate/*.h)
+source_group("Header Files\\geos\\operation\\predicate" FILES ${geos_operation_predicate_HEADERS})
+file(GLOB geos_operation_relate_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/relate/*.h)
+source_group("Header Files\\geos\\operation\\relate" FILES ${geos_operation_relate_HEADERS})
+file(GLOB geos_operation_sharedpaths_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/sharedpaths/*.h)
+source_group("Header Files\\geos\\operation\\sharedpaths" FILES ${geos_operation_sharedpaths_HEADERS})
+file(GLOB geos_operation_union_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/union/*.h)
+source_group("Header Files\\geos\\operation\\union" FILES ${geos_operation_union_HEADERS})
+file(GLOB geos_operation_union_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/union/*.h)
+source_group("Header Files\\geos\\operation\\union" FILES ${geos_operation_union_HEADERS})
+file(GLOB geos_operation_valid_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/operation/valid/*.h)
+source_group("Header Files\\geos\\operation\\valid" FILES ${geos_operation_valid_HEADERS})
+### geos/planargraph
+file(GLOB geos_planargraph_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/planargraph/*.h)
+source_group("Header Files\\geos\\planargraph" FILES ${geos_planargraph_HEADERS})
+file(GLOB geos_planargraph_algorithm_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/planargraph/algorithm/*.h)
+source_group("Header Files\\geos\\planargraph\\algorithm" FILES ${geos_planargraph_algorithm_HEADERS})
+### geso/precision
+file(GLOB geos_precision_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/precision/*.h)
+source_group("Header Files\\geos\\precision" FILES ${geos_precision_HEADERS})
+### geso/simplify
+file(GLOB geos_simplify_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/simplify/*.h)
+source_group("Header Files\\geos\\simplify" FILES ${geos_simplify_HEADERS})
+### geso/util
+file(GLOB geos_util_HEADERS ${CMAKE_SOURCE_DIR}/include/geos/util/*.h)
+source_group("Header Files\\geos\\util" FILES ${geos_util_HEADERS})
+
More information about the geos-commits
mailing list