abd6bd9b66
* Fix 3581 Ftools: union tool leave holes in output * Fix 4500 Simplify tool freezes QGIS * Fix 4466 Fixes for 'v.what.vect' and 'v.generalize' modules in the GRASS plugin * Fix 4552 Patch for v.what.vect * Fix 4035 Print Composer shape combo box not refecting current shape * Partial Fix 3097 Add preference to set/override environment variables * Fix 2749 Move 'Add to Attributes List' button * Fix 4560 Wrong scale displayed in Map canvas * Partial Fix 4383 Ftools: Improve how processes are handled * Fix 3577 Adding a print composer doesn't dirty the document * Fix 3170 Many GDAL Tools don't work in OS X standalone * Fix 3723 Transparency settings are not applied from *.qml * Fix 3576 qml not read automagically for rasters * Fix 2977 Messy uninstallation of the standalone installer * Union and Symetrical difference works only on whole layer fixed * Save some time in node tool for geometry export and avoid detachs * Initialize default symbol to 0 in rule based renderer * Make relative paths default * Fix tab restoration in project properties * Add helpful info to GdalTools Settings dialog on how to configure GDAL path * New vector layer dialog - show CRS as authid-description pair instead of proj4 string * Fix crash with relative file paths if projPath is not yet defined * Add helpful info to GdalTools Settings dialog on how to configure GDAL path * And a lot of other smaller Bugfixes
33 lines
1.3 KiB
CMake
33 lines
1.3 KiB
CMake
$NetBSD: patch-cmake_FindGEOS.cmake,v 1.1 2012/01/23 08:58:00 adam Exp $
|
|
|
|
Avoid application bundles.
|
|
|
|
--- cmake/FindGEOS.cmake.orig 2011-06-07 06:45:26.000000000 +0000
|
|
+++ cmake/FindGEOS.cmake
|
|
@@ -45,7 +45,7 @@ ELSE(WIN32)
|
|
|
|
# try to use framework on mac
|
|
# want clean framework path, not unix compatibility path
|
|
- IF (APPLE)
|
|
+ IF (ELPPA)
|
|
IF (CMAKE_FIND_FRAMEWORK MATCHES "FIRST"
|
|
OR CMAKE_FRAMEWORK_PATH MATCHES "ONLY"
|
|
OR NOT CMAKE_FIND_FRAMEWORK)
|
|
@@ -70,7 +70,7 @@ ELSE(WIN32)
|
|
ENDIF (GEOS_LIBRARY)
|
|
SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
|
|
ENDIF ()
|
|
- ENDIF (APPLE)
|
|
+ ENDIF (ELPPA)
|
|
|
|
IF (NOT GEOS_INCLUDE_DIR OR NOT GEOS_LIBRARY OR NOT GEOS_CONFIG)
|
|
# didn't find OS X framework, and was not set by user
|
|
@@ -114,7 +114,7 @@ ELSE(WIN32)
|
|
## split off the link dirs (for rpath)
|
|
## use regular expression to match wildcard equivalent "-L*<endchar>"
|
|
## with <endchar> is a space or a semicolon
|
|
- STRING(REGEX MATCHALL "[-][L]([^ ;])+"
|
|
+ STRING(REGEX MATCH "[-][L]([^ ;])+"
|
|
GEOS_LINK_DIRECTORIES_WITH_PREFIX
|
|
"${GEOS_CONFIG_LIBS}" )
|
|
#MESSAGE("DBG GEOS_LINK_DIRECTORIES_WITH_PREFIX=${GEOS_LINK_DIRECTORIES_WITH_PREFIX}")
|