Showing with 31,267 additions and 26,090 deletions.
  1. +11 −11 INSTALL
  2. +50 −39 cmake/MacBundleMacros.cmake
  3. +1 −1 cmake/SIPMacros.cmake
  4. +8 −8 doc/osx.t2t
  5. +2,352 −2,048 i18n/qgis_de.ts
  6. +4,365 −7,977 i18n/qgis_es.ts
  7. +9,912 −7,199 i18n/qgis_et.ts
  8. +2,218 −1,863 i18n/qgis_fr.ts
  9. +1 −1 i18n/qgis_it.ts
  10. +9,633 −5,108 i18n/qgis_pl_PL.ts
  11. +17 −11 mac/cmake/1qt.cmake.in
  12. +3 −3 mac/cmake/2lib.cmake.in
  13. +0 −1 python/analysis/analysis.sip
  14. +0 −1 python/core/core.sip
  15. +1 −1 python/core/qgsnetworkaccessmanager.sip
  16. +3 −1 python/core/qgsvectordataprovider.sip
  17. +1 −0 python/core/qgsvectorlayer.sip
  18. +2 −2 python/core/symbology-ng-core.sip
  19. +11 −8 python/gui/qgsgenericprojectionselector.sip
  20. +11 −10 python/plugins/fTools/tools/doDefineProj.py
  21. +1 −1 python/plugins/fTools/tools/doValidate.py
  22. +10 −10 src/analysis/interpolation/ParametricLine.cc
  23. +4 −7 src/app/CMakeLists.txt
  24. +1 −0 src/app/composer/qgscomposer.cpp
  25. +3 −3 src/app/gps/qgsgpsinformationwidget.cpp
  26. +43 −6 src/app/legend/qgslegend.cpp
  27. +160 −144 src/app/main.cpp
  28. +4 −0 src/app/ogr/qgsvectorlayersaveasdialog.cpp
  29. +69 −7 src/app/qgisapp.cpp
  30. +5 −0 src/app/qgisapp.h
  31. +1 −1 src/app/qgisappinterface.cpp
  32. +14 −0 src/app/qgsaddattrdialog.cpp
  33. +4 −0 src/app/qgsaddattrdialog.h
  34. +9 −10 src/app/{attributetable → }/qgsattributetabledialog.cpp
  35. 0 src/app/{attributetable → }/qgsattributetabledialog.h
  36. +9 −1 src/app/qgsattributetypedialog.cpp
  37. +1 −1 src/app/qgsbrowserdockwidget.cpp
  38. +3 −2 src/app/qgsfeatureaction.cpp
  39. +1 −1 src/app/qgsfeatureaction.h
  40. +10 −3 src/app/qgsidentifyresults.cpp
  41. +3 −3 src/app/qgslabelinggui.cpp
  42. +1 −1 src/app/qgsmaptooladdfeature.cpp
  43. +55 −13 src/app/qgsmaptoolcapture.cpp
  44. +8 −4 src/app/qgsmaptoolcapture.h
  45. +1 −1 src/app/qgsmaptoolidentify.cpp
  46. +348 −335 src/app/qgsmaptoolnodetool.cpp
  47. +48 −35 src/app/qgsmaptoolnodetool.h
  48. +5 −0 src/app/{spatialite → }/qgsnewspatialitelayerdialog.cpp
  49. 0 src/app/{spatialite → }/qgsnewspatialitelayerdialog.h
  50. +12 −0 src/app/qgsoptions.cpp
  51. +3 −0 src/app/qgsvectorlayerproperties.cpp
  52. +2 −0 src/core/CMakeLists.txt
  53. +2 −2 src/core/composer/qgscomposermap.h
  54. +1 −1 src/core/gps/qextserialport/qextserialenumerator.cpp
  55. +1 −1 src/core/gps/qgsgpsdetector.cpp
  56. +96 −93 src/core/qgsapplication.cpp
  57. +22 −20 src/core/qgsapplication.h
  58. +0 −1 src/core/qgsattributeaction.cpp
  59. +19 −37 src/core/qgscoordinatereferencesystem.cpp
  60. +1 −0 src/core/qgscoordinatereferencesystem.h
  61. +8 −8 src/core/qgscoordinatetransform.cpp
  62. +1 −0 src/core/qgsdbtablemodel.cpp
  63. +14 −297 src/core/qgsgeometry.cpp
  64. +1 −8 src/core/qgsgeometry.h
  65. +400 −0 src/core/qgsgeometryvalidator.cpp
  66. +60 −0 src/core/qgsgeometryvalidator.h
  67. +3 −3 src/core/qgslogger.cpp
  68. +26 −17 src/core/qgsmaprenderer.cpp
  69. +5 −2 src/core/qgsmaprenderer.h
  70. +1 −1 src/core/qgsmaptopixel.h
  71. +3 −3 src/core/qgsmessagelog.cpp
  72. +2 −2 src/core/qgsmessagelog.h
  73. +0 −1 src/core/qgspoint.cpp
  74. +85 −60 src/core/qgsvectorlayer.cpp
  75. +1 −0 src/core/qgsvectorlayer.h
  76. +3 −3 src/core/raster/qgsrasterlayer.h
  77. +67 −72 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  78. +10 −10 src/core/symbology-ng/qgsrendererv2.cpp
  79. +3 −0 src/gui/CMakeLists.txt
  80. +2 −2 src/gui/attributetable/qgsattributetablememorymodel.cpp
  81. +40 −20 src/gui/attributetable/qgsattributetablemodel.cpp
  82. +16 −2 src/gui/qgsattributeeditor.cpp
  83. +5 −0 src/gui/qgsexpressionbuilderdialog.cpp
  84. +5 −0 src/gui/qgsexpressionbuilderdialog.h
  85. +79 −73 src/gui/qgsexpressionbuilderwidget.cpp
  86. +5 −0 src/gui/qgsexpressionbuilderwidget.h
  87. +60 −0 src/gui/qgsexpressionhighlighter.cpp
  88. +53 −0 src/gui/qgsexpressionhighlighter.h
  89. +3 −3 src/gui/qgsmapcanvas.cpp
  90. +2 −0 src/gui/qgsnewvectorlayerdialog.cpp
  91. +1 −1 src/gui/qgsprojectionselector.h
  92. +16 −2 src/gui/qgsquerybuilder.cpp
  93. +2 −3 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  94. +3 −3 src/plugins/coordinate_capture/coordinatecapture.cpp
  95. +4 −4 src/plugins/gps_importer/qgsgpsdevicedialog.cpp
  96. +2 −1 src/plugins/gps_importer/qgsgpsplugin.cpp
  97. +1 −1 src/plugins/gps_importer/qgsgpsplugingui.cpp
  98. +6 −6 src/plugins/roadgraph/shortestpathwidget.cpp
  99. +2 −4 src/providers/gdal/qgsgdalprovider.cpp
  100. +2 −0 src/providers/gdal/qgsgdalprovider.h
  101. +1 −19 src/providers/grass/qgsgrass.cpp
  102. +26 −14 src/providers/ogr/qgsogrprovider.cpp
  103. +1 −0 src/providers/postgres/qgspostgresprovider.cpp
  104. +1 −1 src/providers/wfs/qgswfsdata.cpp
  105. +182 −70 src/providers/wfs/qgswfsprovider.cpp
  106. +20 −5 src/providers/wfs/qgswfsprovider.h
  107. +53 −43 src/providers/wfs/qgswfssourceselect.cpp
  108. +1 −4 src/providers/wfs/qgswfssourceselect.h
  109. +18 −4 src/providers/wms/qgswmsprovider.cpp
  110. +31 −2 src/ui/qgsattributetypeedit.ui
  111. +7 −0 src/ui/qgsexpressionbuilder.ui
  112. +3 −0 src/ui/qgsgpsinformationwidgetbase.ui
  113. +36 −27 src/ui/qgsoptionsbase.ui
  114. +1 −1 src/ui/qgssymbolv2selectordialogbase.ui
  115. +3 −0 src/ui/qgsvectorlayerpropertiesbase.ui
  116. +12 −2 src/ui/qgswfssourceselectbase.ui
  117. +9 −0 src/ui/symbollayer/widget_fontmarker.ui
  118. +3 −0 src/ui/symbollayer/widget_linedecoration.ui
  119. +6 −0 src/ui/symbollayer/widget_linepatternfill.ui
  120. +1 −1 src/ui/symbollayer/widget_markerline.ui
  121. +12 −0 src/ui/symbollayer/widget_pointpatternfill.ui
  122. +7 −1 src/ui/symbollayer/widget_simplefill.ui
  123. +2 −2 src/ui/symbollayer/widget_simpleline.ui
  124. +4 −4 src/ui/symbollayer/widget_simplemarker.ui
  125. +3 −0 src/ui/symbollayer/widget_svgfill.ui
  126. +9 −5 src/ui/symbollayer/widget_svgmarker.ui
  127. +71 −73 tests/testdata/lines.qml
  128. +91 −90 tests/testdata/points.qml
  129. +71 −73 tests/testdata/polys.qml
22 changes: 11 additions & 11 deletions INSTALL
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Quantum GIS (QGIS)
Building QGIS from source - step by step
Sunday November 06, 2011
Tuesday December 27, 2011


Last Updated: Sunday November 06, 2011
Last Change : Sunday November 06, 2011
Last Updated: Tuesday December 27, 2011
Last Change : Tuesday December 27, 2011


1. Introduction
Expand Down Expand Up @@ -1226,7 +1226,7 @@ http://www.kyngchaos.com/wiki/software/frameworks
Once downloaded, open and install the frameworks.

William provides an additional installer package for Postgresql (for PostGIS
support). Qgis just needs the libpq client library, so unless you want to
support). QGIS just needs the libpq client library, so unless you want to
setup the full Postgres + PostGIS server, all you need is the client-only
package. It's available here:

Expand All @@ -1242,7 +1242,7 @@ http://www.kyngchaos.com/wiki/software/grass

There are some additional dependencies that, at the time of writing, are not
provided as frameworks or installers so we will need to build these from source.
If you are wanting to build Qgis as a 64-bit application, you will need to
If you are wanting to build QGIS as a 64-bit application, you will need to
provide the appropriate build commands to produce 64-bit support in dependencies.
Likewise, for 32-bit support on Snow Leopard, you will need to override the
default system architecture, which is 64-bit, according to instructions for
Expand Down Expand Up @@ -1404,7 +1404,7 @@ http://pyqwt.sourceforge.net/

Double-click the tarball to unpack it. The following assumes PyQwt v5.2.0
(comes with Qwt 5.2.1). Normal compilation does both Qwt and PyQwt at the same
time, but Qwt is statically linked into PyQwt, and Qgis can't use it. So, we
time, but Qwt is statically linked into PyQwt, and QGIS can't use it. So, we
need to split the build.

Now, cd into the qwt-5.2 subdir in a Terminal. Type these commands to build
Expand Down Expand Up @@ -1522,7 +1522,7 @@ This will automatically find and use the previously installed frameworks, and
the GRASS application if installed.

Or, to use a Unix-style build of GRASS, use the following cmake invocation
(minimum GRASS version as stated in the Qgis requirements, substitute the GRASS
(minimum GRASS version as stated in the QGIS requirements, substitute the GRASS
path and version as required):

cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
Expand Down Expand Up @@ -1553,7 +1553,7 @@ script and add arch flags to the configuration:
-D CMAKE_OSX_ARCHITECTURES=i386 -D PYTHON_EXECUTABLE=/usr/local/bin/python32 \
..

The Qgis Mapserver feature requires fastcgi support. This is included in
The QGIS Mapserver feature requires fastcgi support. This is included in
Leopard and Snow Leopard, but was dropped at Lion. To build the Mapserver
component on Leopard and Snow, add the followling line before the last line in
the above configuration:
Expand All @@ -1564,9 +1564,9 @@ On Lion you are on your own to figure out how to install libfcgi and add fcgi
support to the system Apache. Not recommended for the average user.

Bundling note: Older Qt versions may have problems with some Qt plugins and
Qgis. The way to handle this is to bundle Qt inside the Qgis application. You
can do this now or wait to see if there are immediate crashes when running Qgis.
It's also a good idea to bundle Qt if you need to copy Qgis to other Macs (where
QGIS. The way to handle this is to bundle Qt inside the QGIS application. You
can do this now or wait to see if there are immediate crashes when running QGIS.
It's also a good idea to bundle Qt if you need to copy QGIS to other Macs (where
you would have to install Xcode just so Qt would install!).

To bundle Qt, add the following line before the last line (the ".." line) in
Expand Down
89 changes: 50 additions & 39 deletions cmake/MacBundleMacros.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,26 @@ ENDFUNCTION (MYMESSAGE)
# regex stuff taken from GetPrerequisites

FUNCTION (GET_INSTALL_NAME LIBFILE LIBNAME OUTVAR)
EXECUTE_PROCESS (COMMAND otool -L "${LIBFILE}" OUTPUT_VARIABLE iname_out)
# remove 1st line, it's just path to lib file
STRING (REGEX REPLACE ".*:\n" "" iname "${iname_out}")
IF (iname)
# find libname
STRING (REGEX MATCH "[^\n\t ]*${LIBNAME}[^\n ]*" iname "${iname}")
ENDIF (iname)
SET (${OUTVAR} ${iname} PARENT_SCOPE)
IF (EXISTS "${LIBFILE}")
EXECUTE_PROCESS (COMMAND otool -L "${LIBFILE}" OUTPUT_VARIABLE iname_out)
# remove 1st line, it's just path to lib file
STRING (REGEX REPLACE ".*:\n" "" iname "${iname_out}")
IF (iname)
# find libname
STRING (REGEX MATCH "[^\n\t ]*${LIBNAME}[^\n ]*" iname "${iname}")
ENDIF (iname)
SET (${OUTVAR} ${iname} PARENT_SCOPE)
ELSE ()
SET (${OUTVAR} "" PARENT_SCOPE)
ENDIF ()
ENDFUNCTION (GET_INSTALL_NAME)

# install_name_tool -change CHANGE CHANGETO CHANGEBIN

FUNCTION (INSTALLNAMETOOL_CHANGE CHANGE CHANGETO CHANGEBIN)
EXECUTE_PROCESS (COMMAND install_name_tool -change ${CHANGE} ${CHANGETO} "${CHANGEBIN}")
IF (EXISTS "${CHANGEBIN}" AND CHANGE AND CHANGETO)
EXECUTE_PROCESS (COMMAND install_name_tool -change ${CHANGE} ${CHANGETO} "${CHANGEBIN}")
ENDIF ()
ENDFUNCTION (INSTALLNAMETOOL_CHANGE)

# copy a framework, only specified archs, current version, debug dep on CMAKE_BUILD_TYPE
Expand All @@ -59,22 +65,24 @@ FUNCTION (COPY_FRAMEWORK FWPREFIX FWNAME FWDEST)
OUTPUT_VARIABLE FWDIRPHYS
)
STRING (STRIP "${FWDIRPHYS}" FWDIRPHYS)
STRING (REGEX MATCH "[^/\n]+$" FWVER "${FWDIRPHYS}")
EXECUTE_PROCESS (COMMAND mkdir -p "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}")
EXECUTE_PROCESS (COMMAND ln -sfh ${FWVER} "${FWDEST}/${FWNAME}.framework/Versions/Current")
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWNAME}" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}/${FWNAME}")
EXECUTE_PROCESS (COMMAND ln -sf Versions/Current/${FWNAME} "${FWDEST}/${FWNAME}.framework/${FWNAME}")
IF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources")
EXECUTE_PROCESS (COMMAND cp -Rfp "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}")
EXECUTE_PROCESS (COMMAND ln -sfh Versions/Current/Resources "${FWDEST}/${FWNAME}.framework/Resources")
ENDIF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources")
# debug variants
SET (FWD "${FWNAME}_debug")
IF ("${FWDEBUG}" STREQUAL "Debug" AND EXISTS "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWD}")
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWD}" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}/${FWD}")
EXECUTE_PROCESS (COMMAND ln -sf Versions/Current/${FWD} "${FWDEST}/${FWNAME}.framework/${FWD}")
IF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/${FWD}.dSYM")
EXECUTE_PROCESS (COMMAND ditto -X ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/${FWD}.dSYM" "${FWDEST}/${FWNAME}.framework")
IF (IS_DIRECTORY "${FWDIRPHYS}")
STRING (REGEX MATCH "[^/\n]+$" FWVER "${FWDIRPHYS}")
EXECUTE_PROCESS (COMMAND mkdir -p "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}")
EXECUTE_PROCESS (COMMAND ln -sfh ${FWVER} "${FWDEST}/${FWNAME}.framework/Versions/Current")
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWNAME}" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}/${FWNAME}")
EXECUTE_PROCESS (COMMAND ln -sf Versions/Current/${FWNAME} "${FWDEST}/${FWNAME}.framework/${FWNAME}")
IF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources")
EXECUTE_PROCESS (COMMAND cp -Rfp "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}")
EXECUTE_PROCESS (COMMAND ln -sfh Versions/Current/Resources "${FWDEST}/${FWNAME}.framework/Resources")
ENDIF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources")
# debug variants
SET (FWD "${FWNAME}_debug")
IF ("${FWDEBUG}" STREQUAL "Debug" AND EXISTS "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWD}")
EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWD}" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}/${FWD}")
EXECUTE_PROCESS (COMMAND ln -sf Versions/Current/${FWD} "${FWDEST}/${FWNAME}.framework/${FWD}")
IF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/${FWD}.dSYM")
EXECUTE_PROCESS (COMMAND ditto -X ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/${FWD}.dSYM" "${FWDEST}/${FWNAME}.framework")
ENDIF ()
ENDIF ()
ENDIF ()
ENDFUNCTION (COPY_FRAMEWORK)
Expand All @@ -95,16 +103,17 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
ENDIF ()
SET (LIB_CHG_TO "${ATEXECUTABLE}/${LIBMID}/${LIBPOST}")
# app - always @executable_path
INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QAPPDIR}/${QGIS_APP_NAME}")
# qgis_help, qbrowser - doesn't link anything else than Qt/Qgis
INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QBINDIR}/qgis_help.app/Contents/MacOS/qgis_help")
INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QBINDIR}/qbrowser.app/Contents/MacOS/qbrowser")
INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QAPPDIR}/${QGIS_APP_NAME}")
# qgis helper apps - don't link anything else than Qt/Qgis
FOREACH (QA ${QGAPPLIST})
INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QBINDIR}/${QA}.app/Contents/MacOS/${QA}")
ENDFOREACH (QA)
# qgis-mapserver
IF (${WITH_MAPSERVER})
IF (${OSX_HAVE_LOADERPATH})
SET (LIB_CHG_TO "${ATEXECUTABLE}/${QGIS_CGIBIN_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
ENDIF ()
INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QCGIDIR}/qgis_mapserv.fcgi")
INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QCGIDIR}/qgis_mapserv.fcgi")
ENDIF ()
# libs
IF (${OSX_HAVE_LOADERPATH})
Expand All @@ -116,40 +125,40 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
ENDIF ()
ENDIF ()
FOREACH (QL ${QGFWLIST})
INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QFWDIR}/${QL}.framework/${QL}")
INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QFWDIR}/${QL}.framework/${QL}")
ENDFOREACH (QL)
# libqgispython is not a framework
IF (${OSX_HAVE_LOADERPATH})
SET (LIB_CHG_TO "${ATLOADER}/${QGIS_LIB_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
ENDIF ()
INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QLIBDIR}/libqgispython.dylib")
INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QLIBDIR}/libqgispython.dylib")
# GRASS libexec stuff
IF (EXISTS "${QLIBXDIR}/grass/bin/qgis.g.browser")
IF (${OSX_HAVE_LOADERPATH})
SET (LIB_CHG_TO "${ATLOADER}/../../${QGIS_LIBEXEC_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
ENDIF ()
INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QLIBXDIR}/grass/bin/qgis.g.browser")
INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QLIBXDIR}/grass/bin/qgis.g.browser")
ENDIF ()
# plugins
IF (${OSX_HAVE_LOADERPATH})
SET (LIB_CHG_TO "${ATLOADER}/${QGIS_PLUGIN_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
ENDIF ()
FOREACH (QP ${QGPLUGLIST})
INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QP}")
INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QP}")
ENDFOREACH (QP)
# qgis python
IF (${OSX_HAVE_LOADERPATH})
SET (LIB_CHG_TO "${ATLOADER}/../../${QGIS_DATA_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
ENDIF ()
FOREACH (PG ${QGPYLIST})
INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${PG}")
INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${PG}")
ENDFOREACH (PG)
# bin - nothing yet
#IF (${OSX_HAVE_LOADERPATH})
# SET (LIB_CHG_TO "${ATLOADER}/${QGIS_BIN_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
#ENDIF ()
#FOREACH (PB ...)
# INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QBINDIR}/${PB}")
# INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QBINDIR}/${PB}")
#ENDFOREACH (PB)
ENDIF (LIBFROM)
ENDFUNCTION (UPDATEQGISPATHS)
Expand Down Expand Up @@ -177,8 +186,10 @@ FOREACH (QARCH ${CMAKE_OSX_ARCHITECTURES})
ENDFOREACH (QARCH)

# common file lists
FILE (GLOB QGFWLIST RELATIVE ${QFWDIR} ${QFWDIR}/qgis*.framework)
FILE (GLOB QGFWLIST RELATIVE "${QFWDIR}" "${QFWDIR}/qgis*.framework")
# for some reason, REPLACE is stripping list seps
STRING(REPLACE ".framework" ";" QGFWLIST ${QGFWLIST})
FILE (GLOB QGPLUGLIST ${QPLUGDIR}/*.so)
FILE (GLOB QGPYLIST ${QGISPYDIR}/qgis/*.so)
FILE (GLOB QGPLUGLIST "${QPLUGDIR}/*.so")
FILE (GLOB QGPYLIST "${QGISPYDIR}/qgis/*.so")
FILE (GLOB QGAPPLIST RELATIVE "${QBINDIR}" "${QBINDIR}/q*.app")
STRING(REPLACE ".app" ";" QGAPPLIST ${QGAPPLIST})
2 changes: 1 addition & 1 deletion cmake/SIPMacros.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
ADD_DEFINITIONS( /wd4996 /wd4701 /wd4702 )
ELSE(MSVC)
# disable all warnings
ADD_DEFINITIONS( -w )
ADD_DEFINITIONS( -w -fpermissive )
ENDIF(MSVC)
ENDIF(PEDANTIC)

Expand Down
16 changes: 8 additions & 8 deletions doc/osx.t2t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ http://www.kyngchaos.com/wiki/software/frameworks
Once downloaded, open and install the frameworks.

William provides an additional installer package for Postgresql (for PostGIS
support). Qgis just needs the libpq client library, so unless you want to
support). QGIS just needs the libpq client library, so unless you want to
setup the full Postgres + PostGIS server, all you need is the client-only
package. It's available here:

Expand All @@ -97,7 +97,7 @@ http://www.kyngchaos.com/wiki/software/grass

There are some additional dependencies that, at the time of writing, are not
provided as frameworks or installers so we will need to build these from source.
If you are wanting to build Qgis as a 64-bit application, you will need to
If you are wanting to build QGIS as a 64-bit application, you will need to
provide the appropriate build commands to produce 64-bit support in dependencies.
Likewise, for 32-bit support on Snow Leopard, you will need to override the
default system architecture, which is 64-bit, according to instructions for
Expand Down Expand Up @@ -274,7 +274,7 @@ http://pyqwt.sourceforge.net/

Double-click the tarball to unpack it. The following assumes PyQwt v5.2.0
(comes with Qwt 5.2.1). Normal compilation does both Qwt and PyQwt at the same
time, but Qwt is statically linked into PyQwt, and Qgis can't use it. So, we
time, but Qwt is statically linked into PyQwt, and QGIS can't use it. So, we
need to split the build.

Now, cd into the qwt-5.2 subdir in a Terminal. Type these commands to build
Expand Down Expand Up @@ -399,7 +399,7 @@ This will automatically find and use the previously installed frameworks, and
the GRASS application if installed.

Or, to use a Unix-style build of GRASS, use the following cmake invocation
(minimum GRASS version as stated in the Qgis requirements, substitute the GRASS
(minimum GRASS version as stated in the QGIS requirements, substitute the GRASS
path and version as required):

```
Expand Down Expand Up @@ -434,7 +434,7 @@ cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D \
..
```

The Qgis Mapserver feature requires fastcgi support. This is included in
The QGIS Mapserver feature requires fastcgi support. This is included in
Leopard and Snow Leopard, but was dropped at Lion. To build the Mapserver
component on Leopard and Snow, add the followling line before the last line in
the above configuration:
Expand All @@ -447,9 +447,9 @@ On Lion you are on your own to figure out how to install libfcgi and add fcgi
support to the system Apache. Not recommended for the average user.

__Bundling note:__ Older Qt versions may have problems with some Qt plugins and
Qgis. The way to handle this is to bundle Qt inside the Qgis application. You
can do this now or wait to see if there are immediate crashes when running Qgis.
It's also a good idea to bundle Qt if you need to copy Qgis to other Macs (where
QGIS. The way to handle this is to bundle Qt inside the QGIS application. You
can do this now or wait to see if there are immediate crashes when running QGIS.
It's also a good idea to bundle Qt if you need to copy QGIS to other Macs (where
you would have to install Xcode just so Qt would install!).

To bundle Qt, add the following line before the last line (the ".." line) in
Expand Down
Loading