Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/qgis/Quantum-GIS into and…

…roid
  • Loading branch information
mbernasocchi committed Jul 25, 2011
2 parents 8c4cf8e + 05d2cd9 commit 836bd374cea2302aea6ba2dd8826bf3b085ba06d
Showing with 47,271 additions and 6,237 deletions.
  1. +3 −1 .gitignore
  2. +8 −3 CMakeLists.txt
  3. +21 −3 cmake/FindOSGEARTH.cmake
  4. +158 −1 cmake/MacBundleMacros.cmake
  5. +0 −2 debian/qgis-plugin-grass-common.install
  6. +0 −2 debian/qgis-plugin-grass-common.install.lenny
  7. +1 −1 doc/TRANSLATORS
  8. +1,123 −1,126 i18n/qgis_de.ts
  9. +37,342 −0 i18n/qgis_et.ts
  10. +4,604 −3,418 i18n/qgis_fr.ts
  11. +0 −2 images/CMakeLists.txt
  12. +0 −4 images/icons/CMakeLists.txt
  13. +2 −0 images/images.qrc
  14. +0 −5 images/north_arrows/CMakeLists.txt
  15. +0 −5 images/splash/CMakeLists.txt
  16. +1 −0 mac/CMakeLists.txt
  17. +217 −0 mac/app.info.plist.in
  18. +1 −31 mac/cmake/0qgis.cmake.in
  19. +42 −0 mac/cmake/0vars.cmake.in
  20. +29 −111 mac/cmake/1qt.cmake.in
  21. +1 −86 mac/cmake/2lib.cmake.in
  22. +2 −78 mac/cmake/3fw.cmake.in
  23. +26 −0 mac/framework.info.plist.in
  24. +2 −14 ms-windows/osgeo4w/package-nightly.cmd
  25. +8 −0 ms-windows/osgeo4w/package.cmd
  26. +32 −11 python/core/qgssearchtreenode.sip
  27. +25 −5 python/core/qgsvectorlayer.sip
  28. +7 −4 python/core/symbology-ng-core.sip
  29. +3 −3 python/gui/symbology-ng-gui.sip
  30. +6 −0 python/pyspatialite/CMakeLists.txt
  31. +4 −3 resources/context_help/QgsFieldCalculator-de_DE
  32. +3 −2 resources/context_help/QgsFieldCalculator-en_US
  33. +656 −114 resources/symbology-ng-style.xml
  34. +6 −4 src/app/CMakeLists.txt
  35. +1 −0 src/app/attributetable/qgsattributetabledialog.cpp
  36. +3 −0 src/app/composer/qgscomposer.cpp
  37. +7 −7 src/app/composer/qgscomposeritemwidget.cpp
  38. +7 −0 src/app/composer/qgscomposerlegendwidget.cpp
  39. +8 −1 src/app/legend/qgslegend.cpp
  40. +2 −2 src/app/legend/qgslegendlayer.cpp
  41. BIN {images/icons → src/app}/qgis.ico
  42. +37 −15 src/app/qgisapp.cpp
  43. +3 −0 src/app/qgisapp.h
  44. +3 −1 src/app/qgsabout.cpp
  45. +1 −1 src/app/qgsannotationwidget.cpp
  46. +2 −0 src/app/qgsattributetypedialog.cpp
  47. +100 −0 src/app/qgsbrowserdockwidget.cpp
  48. +29 −0 src/app/qgsbrowserdockwidget.h
  49. +36 −36 src/app/qgsembedlayerdialog.cpp
  50. +1 −1 src/app/qgsembedlayerdialog.h
  51. +3 −1 src/app/qgsfieldcalculator.cpp
  52. +30 −1 src/app/qgslabelinggui.cpp
  53. +2 −0 src/app/qgsprojectproperties.cpp
  54. +4 −3 src/app/qgsrasterlayerproperties.cpp
  55. +0 −2 src/browser/CMakeLists.txt
  56. +7 −15 src/browser/qgsbrowser.cpp
  57. +1 −1 src/browser/qgsbrowser.h
  58. +3 −0 src/core/CMakeLists.txt
  59. +1 −1 src/core/composer/qgscomposeritem.h
  60. +1 −1 src/core/composer/qgscomposerlegend.cpp
  61. +1 −1 src/core/composer/qgscomposerlegenditem.h
  62. +2 −2 src/core/composer/qgslegendmodel.cpp
  63. +1 −1 src/core/gps/qgsgpsdconnection.cpp
  64. +0 −1 src/core/pal/feature.cpp
  65. +1 −1 src/core/pal/internalexception.h
  66. +8 −0 src/core/pal/layer.cpp
  67. +2 −1 src/core/pal/util.cpp
  68. +1 −1 src/core/qgsapplication.cpp
  69. +45 −20 src/{browser → core}/qgsbrowsermodel.cpp
  70. +6 −4 src/{browser → core}/qgsbrowsermodel.h
  71. +2 −0 src/core/qgsdataitem.h
  72. +59 −7 src/core/qgspallabeling.cpp
  73. +4 −0 src/core/qgspallabeling.h
  74. +2 −2 src/core/qgsproject.h
  75. +2 −0 src/core/qgsproviderregistry.cpp
  76. +1 −0 src/core/qgssearchstringlexer.ll
  77. +58 −22 src/core/qgssearchtreenode.cpp
  78. +4 −2 src/core/qgssearchtreenode.h
  79. +3 −2 src/core/qgsvectorlayer.cpp
  80. +3 −2 src/core/qgsvectorlayer.h
  81. +18 −18 src/core/spatialindex/include/RTree.h
  82. +5 −5 src/core/spatialindex/include/SpatialIndex.h
  83. +19 −5 src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
  84. +331 −0 src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
  85. +100 −0 src/core/symbology-ng/qgsellipsesymbollayerv2.h
  86. +5 −5 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  87. +20 −5 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  88. +4 −4 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  89. +10 −10 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  90. +6 −6 src/core/symbology-ng/qgsrendererv2.cpp
  91. +15 −1 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  92. +3 −0 src/core/symbology-ng/qgsrulebasedrendererv2.h
  93. +12 −4 src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
  94. +3 −3 src/core/symbology-ng/qgssvgcache.cpp
  95. +6 −1 src/core/symbology-ng/qgssymbollayerv2.h
  96. +3 −0 src/core/symbology-ng/qgssymbollayerv2registry.cpp
  97. +5 −3 src/core/symbology-ng/qgssymbollayerv2registry.h
  98. +25 −11 src/core/symbology-ng/qgssymbolv2.cpp
  99. +11 −4 src/core/symbology-ng/qgssymbolv2.h
  100. +2 −0 src/gui/CMakeLists.txt
  101. +1 −1 src/gui/qgsannotationitem.cpp
  102. +6 −3 src/gui/qgsattributeeditor.cpp
  103. +1 −1 src/gui/qgsfieldvalidator.cpp
  104. +2 −2 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
  105. +278 −0 src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
  106. +48 −0 src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h
  107. +2 −2 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  108. +1 −1 src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  109. +1 −1 src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp
  110. +2 −2 src/gui/symbology-ng/qgsstylev2managerdialog.cpp
  111. +21 −21 src/gui/symbology-ng/qgssymbollayerv2widget.cpp
  112. +23 −19 src/gui/symbology-ng/qgssymbollayerv2widget.h
  113. +5 −3 src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
  114. +4 −1 src/gui/symbology-ng/qgssymbolv2propertiesdialog.h
  115. +3 −3 src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
  116. +3 −1 src/gui/symbology-ng/qgssymbolv2selectordialog.h
  117. +9 −5 src/mapserver/qgis_map_serv.cpp
  118. +1 −1 src/mapserver/qgsconfigcache.cpp
  119. +16 −3 src/mapserver/qgsconfigparser.cpp
  120. +1 −0 src/mapserver/qgshttprequesthandler.cpp
  121. +2 −2 src/mapserver/qgspostrequesthandler.cpp
  122. +35 −30 src/mapserver/qgsprojectparser.cpp
  123. +57 −3 src/mapserver/qgswmsserver.cpp
  124. +1 −1 src/plugins/CMakeLists.txt
  125. +24 −5 src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
  126. +10 −0 src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui
  127. +6 −2 src/plugins/globe/CMakeLists.txt
  128. +1 −0 src/plugins/globe/CMakeModules/FindOSG.cmake
  129. +2 −2 src/plugins/globe/CMakeModules/FindOpenThreads.cmake
  130. +5 −4 src/plugins/globe/WorldWindOptions
  131. +252 −219 src/plugins/globe/globe_plugin.cpp
  132. +38 −39 src/plugins/globe/globe_plugin.h
  133. +141 −139 src/plugins/globe/globe_plugin_dialog.cpp
  134. +19 −19 src/plugins/globe/globe_plugin_dialog.h
  135. +87 −83 src/plugins/globe/qgsosgearthtilesource.cpp
  136. +23 −18 src/plugins/globe/qgsosgearthtilesource.h
  137. +45 −44 src/plugins/globe/qgsosgviewer.cpp
  138. +44 −44 src/plugins/globe/qgsosgviewer.h
  139. +1 −2 src/plugins/grass/CMakeLists.txt
  140. +114 −102 src/plugins/grass/qgsgrass_plugin.qrc
  141. +1 −1 src/plugins/grass/qgsgrassnewmapset.cpp
  142. +0 −3 src/plugins/grass/themes/CMakeLists.txt
  143. +0 −5 src/plugins/grass/themes/classic/CMakeLists.txt
  144. BIN src/plugins/grass/themes/classic/world.png
  145. +0 −5 src/plugins/grass/themes/default/CMakeLists.txt
  146. BIN src/plugins/grass/themes/default/world.png
  147. +0 −5 src/plugins/grass/themes/gis/CMakeLists.txt
  148. +1 −2 src/plugins/north_arrow/plugin.cpp
  149. +1 −1 src/plugins/north_arrow/plugingui.cpp
  150. +4 −4 src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp
  151. +1 −1 src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.h
  152. +1 −1 src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp
  153. +4 −2 src/plugins/roadgraph/linevectorlayerdirector.cpp
  154. +20 −20 src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp
  155. +3 −3 src/plugins/zonal_statistics/qgszonalstatisticsdialog.h
  156. +8 −8 src/plugins/zonal_statistics/qgszonalstatisticsplugin.cpp
  157. +7 −7 src/plugins/zonal_statistics/qgszonalstatisticsplugin.h
  158. +20 −2 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  159. +1 −0 src/providers/delimitedtext/qgsdelimitedtextprovider.h
  160. +3 −1 src/providers/ogr/qgsogrprovider.cpp
  161. +3 −0 src/providers/ogr/qgsogrprovider.h
  162. +43 −5 src/providers/postgres/qgspostgresprovider.cpp
  163. +8 −8 src/providers/spatialite/qgsspatialiteprovider.cpp
  164. +5 −5 src/providers/spatialite/qgsspatialiteprovider.h
  165. +4 −1 src/providers/wms/qgswmssourceselect.cpp
  166. +14 −13 src/ui/qgsabout.ui
  167. +15 −0 src/ui/qgsattributetabledialog.ui
  168. +12 −2 src/ui/qgsattributetypeedit.ui
  169. +47 −2 src/ui/qgslabelingguibase.ui
  170. +18 −8 src/ui/qgsprojectpropertiesbase.ui
  171. +11 −12 src/ui/qgswmssourceselectbase.ui
  172. +248 −0 src/ui/symbollayer/widget_ellipse.ui
@@ -12,7 +12,7 @@ debian/*.substvars
Makefile
*-stamp
api_doc
build
build*
ms-windows/Installer-Files/postinstall.bat
ms-windows/Installer-Files/preremove.bat
ms-windows/osgeo4w/packages/
@@ -37,3 +37,5 @@ scripts/astyle.exe
doc/CODING.html
doc/CODING.tex
doc/INSTALL.tex
scripts/Debug
scripts/RelWithDebInfo
@@ -76,9 +76,10 @@ IF (WITH_BINDINGS)
SET (BINDINGS_GLOBAL_INSTALL FALSE CACHE BOOL "Install bindings to global python directory? (might need root)")
ENDIF (WITH_BINDINGS)

SET (WITH_GLOBE TRUE CACHE BOOL "Determines whether Globe plugin should be built")
SET (WITH_GLOBE FALSE CACHE BOOL "Determines whether Globe plugin should be built")
IF (WITH_GLOBE)
FIND_PACKAGE(OSGEARTH)
SET(QT_USE_QTOPENGL 1)
FIND_PACKAGE(OSGEARTH REQUIRED)
ENDIF (WITH_GLOBE)

# Compile flag. Make it possible to turn it off.
@@ -285,6 +286,7 @@ ELSE (WIN32)
# 2 non-system libraries, "standard"
# 3 non-system frameworks, "standalone"
SET (QGIS_MACAPP_BUNDLE 1 CACHE STRING "What to bundle into app package")
SET (QGIS_MACAPP_BUNDLE_USER "" CACHE STRING "Path to user bundling script")
SET (QGIS_MACAPP_INSTALL_DEV FALSE CACHE BOOL "Install developer frameworks")
SET (QGIS_MACAPP_DEV_PREFIX "/Library/Frameworks" CACHE STRING "Path to install developer frameworks")
# if we have @loader_path, >=OSX 10.5 (darwin 9+)
@@ -437,7 +439,10 @@ IF (GIT_MARKER)
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
ELSE(MSVC)
EXECUTE_PROCESS(COMMAND ${GIT} log -n1 --pretty=%h OUTPUT_VARIABLE REVISION)
EXECUTE_PROCESS(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND ${GIT} log -n1 --pretty=%h OUTPUT_VARIABLE REVISION
)
STRING(STRIP "${REVISION}" REVISION)
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
@@ -26,6 +26,7 @@ FIND_PATH( ${THIS_OSGEARTH_INCLUDE_DIR} ${THIS_OSGEARTH_INCLUDE_FILE}
$ENV{OSGEARTH_SOURCE_DIR}
$ENV{OSGEARTHDIR}
$ENV{OSGEARTH_DIR}
$ENV{OSGEO4W_ROOT}
/usr/local/
/usr/
/sw/ # Fink
@@ -57,6 +58,7 @@ FIND_LIBRARY(${MYLIBRARY}
$ENV{OSGEARTH_DIR}
$ENV{OSGEARTHDIR}
$ENV{OSGEARTH_ROOT}
$ENV{OSGEO4W_ROOT}
~/Library/Frameworks
/Library/Frameworks
/usr/local
@@ -79,13 +81,13 @@ FIND_LIBRARY(${MYLIBRARY}
ENDMACRO(FIND_OSGEARTH_LIBRARY LIBRARY LIBRARYNAME)

FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY osgEarth )
FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY_DEBUG osgEarthd)
FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY_DEBUG osgEarthd )

FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY osgEarthUtil )
FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY_DEBUG osgEarthUtild)
FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY_DEBUG osgEarthUtild )

FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY osgEarthFeatures )
FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY_DEBUG osgEarthFeaturesd)
FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY_DEBUG osgEarthFeaturesd )

FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY osgEarthSymbology )
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY_DEBUG osgEarthSymbologyd )
@@ -95,6 +97,22 @@ SET( OSGEARTH_FOUND "NO" )
IF( OSGEARTH_LIBRARY AND OSGEARTH_INCLUDE_DIR )
SET( OSGEARTH_FOUND "YES" )
SET( OSGEARTH_INCLUDE_DIRS ${OSGEARTH_INCLUDE_DIR} ${OSGEARTH_GEN_INCLUDE_DIR} )
INCLUDE(CheckCXXSourceCompiles)
SET(SAFE_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES})
SET(SAFE_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OSGEARTH_INCLUDE_DIR})
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${OSGEARTHUTIL_LIBRARY})
CHECK_CXX_SOURCE_COMPILES("
#include <osgEarthUtil/Controls>
using namespace osgEarth::Util::Controls;
int main(int argc, char **argv)
{
Container *c;
c->setChildSpacing(0.0);
}
" HAVE_OSGEARTH_CHILD_SPACING)
SET(CMAKE_REQUIRED_INCLUDES ${SAFE_CMAKE_REQUIRED_INCLUDES})
SET(CMAKE_REQUIRED_LIBRARIES ${SAFE_CMAKE_REQUIRED_LIBRARIES})
GET_FILENAME_COMPONENT( OSGEARTH_LIBRARIES_DIR ${OSGEARTH_LIBRARY} PATH )
ENDIF( OSGEARTH_LIBRARY AND OSGEARTH_INCLUDE_DIR )

@@ -1,11 +1,32 @@
# Mac Bundle Macros
# QGIS Mac Bundle Macros

# BundleUtilities has functions to bundle and fixup libraries into an
# application package, but it's all-or-nothing and is missing some features:
#
# - @loader_path
# - helper functions can't get install_name, just dependencies

# the following cmakecache vars must be set, redefine them
# with config-file substitutions in install-run scripts:
#
# CPACK_PACKAGE_VERSION_MAJOR, CPACK_PACKAGE_VERSION_MINOR
# CMAKE_INSTALL_PREFIX, CMAKE_VERBOSE_MAKEFILE, CMAKE_BUILD_TYPE
# CMAKE_OSX_ARCHITECTURES, OSX_HAVE_LOADERPATH
# QGIS_APP_NAME
# QGIS_MACAPP_PREFIX
# QGIS_*_SUBDIR, QGIS_*_SUBDIR_REV
# WITH_*

# this file must only be included after target installation is complete

# message only if verbose makefiles

FUNCTION (MYMESSAGE MSG)
IF (@CMAKE_VERBOSE_MAKEFILE@)
MESSAGE (STATUS "${MSG}")
ENDIF (@CMAKE_VERBOSE_MAKEFILE@)
ENDFUNCTION (MYMESSAGE)

# get the install_name of a library or framework
# regex stuff taken from GetPrerequisites

@@ -25,3 +46,139 @@ ENDFUNCTION (GET_INSTALL_NAME)
FUNCTION (INSTALLNAMETOOL_CHANGE CHANGE CHANGETO CHANGEBIN)
EXECUTE_PROCESS (COMMAND install_name_tool -change ${CHANGE} ${CHANGETO} "${CHANGEBIN}")
ENDFUNCTION (INSTALLNAMETOOL_CHANGE)

# copy a framework, only specified archs, current version, debug dep on CMAKE_BUILD_TYPE

FUNCTION (COPY_FRAMEWORK FWPREFIX FWNAME FWDEST)
# reconstruct framework to avoid excessive copying, then deleting
# especially when debug variants are present
# find current version
# use python because pwd not working with WORKING_DIRECTORY param
EXECUTE_PROCESS (
COMMAND python -c "import os.path\nprint os.path.realpath(\"${FWPREFIX}/${FWNAME}.framework/Versions/Current\")"
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")
ENDIF ()
ENDIF ()
ENDFUNCTION (COPY_FRAMEWORK)

# update a library path in all QGIS binary files
# if dylib, change LIBFROM to LIBTO as is
# else assumes it's a framework, change LIBFROM to LIBTO.framework/LIBTO

FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
IF (LIBFROM)
STRING (REGEX MATCH "\\.dylib$" ISLIB "${LIBTO}")
IF (ISLIB)
SET (LIBPOST "${LIBTO}")
SET (LIBMID "${QGIS_LIB_SUBDIR}")
ElSE ()
SET (LIBPOST "${LIBTO}.framework/${LIBTO}")
SET (LIBMID "${QGIS_FW_SUBDIR}")
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")
# 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")
ENDIF ()
# libs
IF (${OSX_HAVE_LOADERPATH})
# bundled frameworks can use short relative path
IF (ISLIB})
SET (LIB_CHG_TO "${ATLOADER}/${QGIS_FW_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
ElSE ()
SET (LIB_CHG_TO "${ATLOADER}/../../../${LIBPOST}")
ENDIF ()
ENDIF ()
FOREACH (QL ${QGFWLIST})
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")
# 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")
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}")
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}")
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}")
#ENDFOREACH (PB)
ENDIF (LIBFROM)
ENDFUNCTION (UPDATEQGISPATHS)

SET (ATEXECUTABLE "@executable_path")
SET (ATLOADER "@loader_path")
SET (Q_FWVER ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})

# install destinations
SET (QAPPDIRC "$ENV{DESTDIR}${QGIS_MACAPP_PREFIX}")
SET (QAPPDIR "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}")
SET (QFWDIR "${QAPPDIR}/${QGIS_FW_SUBDIR}")
SET (QBINDIR "${QAPPDIR}/${QGIS_BIN_SUBDIR}")
SET (QCGIDIR "${QAPPDIR}/${QGIS_CGIBIN_SUBDIR}")
SET (QLIBDIR "${QAPPDIR}/${QGIS_LIB_SUBDIR}")
SET (QLIBXDIR "${QAPPDIR}/${QGIS_LIBEXEC_SUBDIR}")
SET (QDATADIR "${QAPPDIR}/${QGIS_DATA_SUBDIR}")
SET (QPLUGDIR "${QAPPDIR}/${QGIS_PLUGIN_SUBDIR}")
SET (QGISPYDIR "${QAPPDIR}/${QGIS_DATA_SUBDIR}/python")

# build arches
SET (QARCHS "")
FOREACH (QARCH ${CMAKE_OSX_ARCHITECTURES})
SET (QARCHS ${QARCHS} "--arch" "${QARCH}")
ENDFOREACH (QARCH)

# common file lists
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)
@@ -1,8 +1,6 @@
usr/share/qgis/grass/locations.gml
usr/share/qgis/grass/world.png
usr/share/qgis/grass/config
usr/share/qgis/grass/modules/*.png
usr/share/qgis/grass/modules/*.qgm
usr/share/qgis/grass/modules/*.svg
usr/share/qgis/grass/scripts/*.py
usr/share/qgis/themes/*/grass
@@ -1,7 +1,5 @@
usr/share/qgis/grass/locations.gml
usr/share/qgis/grass/world.png
usr/share/qgis/grass/config
usr/share/qgis/grass/modules/*.png
usr/share/qgis/grass/modules/*.qgm
usr/share/qgis/grass/modules/*.svg
usr/share/qgis/themes/*/grass
@@ -18,7 +18,7 @@ Croatian|Zoran Jankovic
Czech|Martin Landa, Peter Antolik, Martin Dzurov, Jan Helebrant
Danish|Henriette Roued
Dutch|Richard Duivenvoorde, Raymond Nijssen
French|Eve Rousseau, Marc Monnerat, Lionel Roubeyrie, Jean Roc Morreale, Benjamin Bohard, Jeremy Garniaux, Yves Jacolin, Benjamin Lerre, Stéphane Morel, Marie Silvestre, Tahir Tamba, Xavier M, Mayeul Kauffmann
French|Eve Rousseau, Marc Monnerat, Lionel Roubeyrie, Jean Roc Morreale, Benjamin Bohard, Jeremy Garniaux, Yves Jacolin, Benjamin Lerre, Stéphane Morel, Marie Silvestre, Tahir Tamba, Xavier M, Mayeul Kauffmann, Mehdi Semchaoui
Georgian|Shota Murtskhvaladze, George Machitidze
German|Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho
Greek|Evripidis Argyropoulos, Mike Pegnigiannis, Nikos Ves

0 comments on commit 836bd37

Please sign in to comment.
You can’t perform that action at this time.