Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:qgis/Quantum-GIS

  • Loading branch information
mhugent committed Jul 6, 2011
2 parents bd495c1 + 49e9a62 commit bff8e544655cc0ecf7247ff2954794918faac471
Showing with 3,730 additions and 343 deletions.
  1. +5 −0 CMakeLists.txt
  2. +101 −0 cmake/FindOSGEARTH.cmake
  3. +31 −31 cmake/FindQGIS.cmake
  4. +13 −13 images/icons/CMakeLists.txt
  5. 0 {src/mac/Contents/Resources → images/icons/mac}/CMakeLists.txt
  6. BIN {src/mac/Contents/Resources → images/icons/mac}/asc.icns
  7. BIN {src/mac/Contents/Resources → images/icons/mac}/ddf.icns
  8. BIN {src/mac/Contents/Resources → images/icons/mac}/dem.icns
  9. BIN {src/mac/Contents/Resources → images/icons/mac}/dt0.icns
  10. BIN {src/mac/Contents/Resources → images/icons/mac}/gml.icns
  11. BIN {src/mac/Contents/Resources → images/icons/mac}/img.icns
  12. BIN {src/mac/Contents/Resources → images/icons/mac}/jp2.icns
  13. BIN {src/mac/Contents/Resources → images/icons/mac}/mif.icns
  14. BIN {src/mac/Contents/Resources → images/icons/mac}/qgis.icns
  15. BIN {src/mac/Contents/Resources → images/icons/mac}/qgs.icns
  16. BIN {src/mac/Contents/Resources → images/icons/mac}/qgs.psd
  17. BIN {src/mac/Contents/Resources → images/icons/mac}/shp.icns
  18. BIN {src/mac/Contents/Resources → images/icons/mac}/tiff.icns
  19. BIN {src/app → images/icons}/qgis.ico
  20. +1 −1 python/pyspatialite/CMakeLists.txt
  21. +4 −0 src/app/CMakeLists.txt
  22. +2 −3 src/app/composer/qgscomposer.cpp
  23. +6 −6 src/app/postgres/qgspgsourceselect.cpp
  24. +11 −11 src/core/CMakeLists.txt
  25. +0 −1 src/mac/CMakeLists.txt
  26. +0 −34 src/mac/Contents/CMakeLists.txt
  27. +0 −15 src/mac/Contents/Info.plist.cmake
  28. +0 −217 src/mac/Contents/Info.plist.in
  29. +0 −1 src/mac/Contents/PkgInfo
  30. +4 −5 src/mapserver/qgswmsserver.cpp
  31. +4 −0 src/plugins/CMakeLists.txt
  32. +76 −0 src/plugins/globe/CMakeLists.txt
  33. +122 −0 src/plugins/globe/CMakeModules/FindOSG.cmake
  34. +185 −0 src/plugins/globe/CMakeModules/FindOpenThreads.cmake
  35. +90 −0 src/plugins/globe/WorldWindOptions
  36. BIN src/plugins/globe/data/worldwind_srtm/0/0000/0000_0000.bil
  37. BIN src/plugins/globe/data/worldwind_srtm/0/0000/0000_0001.bil
  38. BIN src/plugins/globe/data/worldwind_srtm/0/0000/0000_0002.bil
  39. BIN src/plugins/globe/data/worldwind_srtm/0/0000/0000_0003.bil
  40. BIN src/plugins/globe/data/worldwind_srtm/0/0000/0000_0004.bil
  41. BIN src/plugins/globe/data/worldwind_srtm/0/0000/0000_0005.bil
  42. BIN src/plugins/globe/data/worldwind_srtm/0/0000/0000_0006.bil
  43. BIN src/plugins/globe/data/worldwind_srtm/0/0000/0000_0007.bil
  44. BIN src/plugins/globe/data/worldwind_srtm/0/0000/0000_0008.bil
  45. BIN src/plugins/globe/data/worldwind_srtm/0/0001/0001_0000.bil
  46. BIN src/plugins/globe/data/worldwind_srtm/0/0001/0001_0001.bil
  47. BIN src/plugins/globe/data/worldwind_srtm/0/0001/0001_0002.bil
  48. BIN src/plugins/globe/data/worldwind_srtm/0/0001/0001_0003.bil
  49. BIN src/plugins/globe/data/worldwind_srtm/0/0001/0001_0004.bil
  50. BIN src/plugins/globe/data/worldwind_srtm/0/0001/0001_0005.bil
  51. BIN src/plugins/globe/data/worldwind_srtm/0/0001/0001_0006.bil
  52. BIN src/plugins/globe/data/worldwind_srtm/0/0001/0001_0007.bil
  53. BIN src/plugins/globe/data/worldwind_srtm/0/0001/0001_0008.bil
  54. BIN src/plugins/globe/data/worldwind_srtm/0/0002/0002_0000.bil
  55. BIN src/plugins/globe/data/worldwind_srtm/0/0002/0002_0001.bil
  56. BIN src/plugins/globe/data/worldwind_srtm/0/0002/0002_0002.bil
  57. BIN src/plugins/globe/data/worldwind_srtm/0/0002/0002_0003.bil
  58. BIN src/plugins/globe/data/worldwind_srtm/0/0002/0002_0004.bil
  59. BIN src/plugins/globe/data/worldwind_srtm/0/0002/0002_0005.bil
  60. BIN src/plugins/globe/data/worldwind_srtm/0/0002/0002_0006.bil
  61. BIN src/plugins/globe/data/worldwind_srtm/0/0002/0002_0007.bil
  62. BIN src/plugins/globe/data/worldwind_srtm/0/0002/0002_0008.bil
  63. BIN src/plugins/globe/data/worldwind_srtm/0/0003/0003_0000.bil
  64. BIN src/plugins/globe/data/worldwind_srtm/0/0003/0003_0001.bil
  65. BIN src/plugins/globe/data/worldwind_srtm/0/0003/0003_0002.bil
  66. BIN src/plugins/globe/data/worldwind_srtm/0/0003/0003_0003.bil
  67. BIN src/plugins/globe/data/worldwind_srtm/0/0003/0003_0004.bil
  68. BIN src/plugins/globe/data/worldwind_srtm/0/0003/0003_0005.bil
  69. BIN src/plugins/globe/data/worldwind_srtm/0/0003/0003_0006.bil
  70. BIN src/plugins/globe/data/worldwind_srtm/0/0003/0003_0007.bil
  71. BIN src/plugins/globe/data/worldwind_srtm/0/0003/0003_0008.bil
  72. BIN src/plugins/globe/data/worldwind_srtm/0/0004/0004_0000.bil
  73. BIN src/plugins/globe/data/worldwind_srtm/0/0004/0004_0001.bil
  74. BIN src/plugins/globe/data/worldwind_srtm/0/0004/0004_0002.bil
  75. BIN src/plugins/globe/data/worldwind_srtm/0/0004/0004_0003.bil
  76. BIN src/plugins/globe/data/worldwind_srtm/0/0004/0004_0004.bil
  77. BIN src/plugins/globe/data/worldwind_srtm/0/0004/0004_0005.bil
  78. BIN src/plugins/globe/data/worldwind_srtm/0/0004/0004_0006.bil
  79. BIN src/plugins/globe/data/worldwind_srtm/0/0004/0004_0007.bil
  80. BIN src/plugins/globe/data/worldwind_srtm/0/0004/0004_0008.bil
  81. BIN src/plugins/globe/data/worldwind_srtm/0/0005/0005_0000.bil
  82. BIN src/plugins/globe/data/worldwind_srtm/0/0005/0005_0001.bil
  83. BIN src/plugins/globe/data/worldwind_srtm/0/0005/0005_0002.bil
  84. BIN src/plugins/globe/data/worldwind_srtm/0/0005/0005_0003.bil
  85. BIN src/plugins/globe/data/worldwind_srtm/0/0005/0005_0004.bil
  86. BIN src/plugins/globe/data/worldwind_srtm/0/0005/0005_0005.bil
  87. BIN src/plugins/globe/data/worldwind_srtm/0/0005/0005_0006.bil
  88. BIN src/plugins/globe/data/worldwind_srtm/0/0005/0005_0007.bil
  89. BIN src/plugins/globe/data/worldwind_srtm/0/0005/0005_0008.bil
  90. BIN src/plugins/globe/data/worldwind_srtm/0/0006/0006_0000.bil
  91. BIN src/plugins/globe/data/worldwind_srtm/0/0006/0006_0001.bil
  92. BIN src/plugins/globe/data/worldwind_srtm/0/0006/0006_0002.bil
  93. BIN src/plugins/globe/data/worldwind_srtm/0/0006/0006_0003.bil
  94. BIN src/plugins/globe/data/worldwind_srtm/0/0006/0006_0004.bil
  95. BIN src/plugins/globe/data/worldwind_srtm/0/0006/0006_0005.bil
  96. BIN src/plugins/globe/data/worldwind_srtm/0/0006/0006_0006.bil
  97. BIN src/plugins/globe/data/worldwind_srtm/0/0006/0006_0007.bil
  98. BIN src/plugins/globe/data/worldwind_srtm/0/0006/0006_0008.bil
  99. BIN src/plugins/globe/data/worldwind_srtm/0/0007/0007_0000.bil
  100. BIN src/plugins/globe/data/worldwind_srtm/0/0007/0007_0001.bil
  101. BIN src/plugins/globe/data/worldwind_srtm/0/0007/0007_0002.bil
  102. BIN src/plugins/globe/data/worldwind_srtm/0/0007/0007_0003.bil
  103. BIN src/plugins/globe/data/worldwind_srtm/0/0007/0007_0004.bil
  104. BIN src/plugins/globe/data/worldwind_srtm/0/0007/0007_0005.bil
  105. BIN src/plugins/globe/data/worldwind_srtm/0/0007/0007_0006.bil
  106. BIN src/plugins/globe/data/worldwind_srtm/0/0007/0007_0007.bil
  107. BIN src/plugins/globe/data/worldwind_srtm/0/0007/0007_0008.bil
  108. BIN src/plugins/globe/data/worldwind_srtm/0/0008/0008_0000.bil
  109. BIN src/plugins/globe/data/worldwind_srtm/0/0008/0008_0001.bil
  110. BIN src/plugins/globe/data/worldwind_srtm/0/0008/0008_0002.bil
  111. BIN src/plugins/globe/data/worldwind_srtm/0/0008/0008_0003.bil
  112. BIN src/plugins/globe/data/worldwind_srtm/0/0008/0008_0004.bil
  113. BIN src/plugins/globe/data/worldwind_srtm/0/0008/0008_0005.bil
  114. BIN src/plugins/globe/data/worldwind_srtm/0/0008/0008_0006.bil
  115. BIN src/plugins/globe/data/worldwind_srtm/0/0008/0008_0007.bil
  116. BIN src/plugins/globe/data/worldwind_srtm/0/0008/0008_0008.bil
  117. BIN src/plugins/globe/data/worldwind_srtm/0/0009/0009_0000.bil
  118. BIN src/plugins/globe/data/worldwind_srtm/0/0009/0009_0001.bil
  119. BIN src/plugins/globe/data/worldwind_srtm/0/0009/0009_0002.bil
  120. BIN src/plugins/globe/data/worldwind_srtm/0/0009/0009_0003.bil
  121. BIN src/plugins/globe/data/worldwind_srtm/0/0009/0009_0004.bil
  122. BIN src/plugins/globe/data/worldwind_srtm/0/0009/0009_0005.bil
  123. BIN src/plugins/globe/data/worldwind_srtm/0/0009/0009_0006.bil
  124. BIN src/plugins/globe/data/worldwind_srtm/0/0009/0009_0007.bil
  125. BIN src/plugins/globe/data/worldwind_srtm/0/0009/0009_0008.bil
  126. BIN src/plugins/globe/data/worldwind_srtm/0/0010/0010_0000.bil
  127. BIN src/plugins/globe/data/worldwind_srtm/0/0010/0010_0001.bil
  128. BIN src/plugins/globe/data/worldwind_srtm/0/0010/0010_0002.bil
  129. BIN src/plugins/globe/data/worldwind_srtm/0/0010/0010_0003.bil
  130. BIN src/plugins/globe/data/worldwind_srtm/0/0010/0010_0004.bil
  131. BIN src/plugins/globe/data/worldwind_srtm/0/0010/0010_0005.bil
  132. BIN src/plugins/globe/data/worldwind_srtm/0/0010/0010_0006.bil
  133. BIN src/plugins/globe/data/worldwind_srtm/0/0010/0010_0007.bil
  134. BIN src/plugins/globe/data/worldwind_srtm/0/0010/0010_0008.bil
  135. BIN src/plugins/globe/data/worldwind_srtm/0/0011/0011_0000.bil
  136. BIN src/plugins/globe/data/worldwind_srtm/0/0011/0011_0001.bil
  137. BIN src/plugins/globe/data/worldwind_srtm/0/0011/0011_0002.bil
  138. BIN src/plugins/globe/data/worldwind_srtm/0/0011/0011_0003.bil
  139. BIN src/plugins/globe/data/worldwind_srtm/0/0011/0011_0004.bil
  140. BIN src/plugins/globe/data/worldwind_srtm/0/0011/0011_0005.bil
  141. BIN src/plugins/globe/data/worldwind_srtm/0/0011/0011_0006.bil
  142. BIN src/plugins/globe/data/worldwind_srtm/0/0011/0011_0007.bil
  143. BIN src/plugins/globe/data/worldwind_srtm/0/0011/0011_0008.bil
  144. BIN src/plugins/globe/data/worldwind_srtm/0/0012/0012_0000.bil
  145. BIN src/plugins/globe/data/worldwind_srtm/0/0012/0012_0001.bil
  146. BIN src/plugins/globe/data/worldwind_srtm/0/0012/0012_0002.bil
  147. BIN src/plugins/globe/data/worldwind_srtm/0/0012/0012_0003.bil
  148. BIN src/plugins/globe/data/worldwind_srtm/0/0012/0012_0004.bil
  149. BIN src/plugins/globe/data/worldwind_srtm/0/0012/0012_0005.bil
  150. BIN src/plugins/globe/data/worldwind_srtm/0/0012/0012_0006.bil
  151. BIN src/plugins/globe/data/worldwind_srtm/0/0012/0012_0007.bil
  152. BIN src/plugins/globe/data/worldwind_srtm/0/0012/0012_0008.bil
  153. BIN src/plugins/globe/data/worldwind_srtm/0/0013/0013_0000.bil
  154. BIN src/plugins/globe/data/worldwind_srtm/0/0013/0013_0001.bil
  155. BIN src/plugins/globe/data/worldwind_srtm/0/0013/0013_0002.bil
  156. BIN src/plugins/globe/data/worldwind_srtm/0/0013/0013_0003.bil
  157. BIN src/plugins/globe/data/worldwind_srtm/0/0013/0013_0004.bil
  158. BIN src/plugins/globe/data/worldwind_srtm/0/0013/0013_0005.bil
  159. BIN src/plugins/globe/data/worldwind_srtm/0/0013/0013_0006.bil
  160. BIN src/plugins/globe/data/worldwind_srtm/0/0013/0013_0007.bil
  161. BIN src/plugins/globe/data/worldwind_srtm/0/0013/0013_0008.bil
  162. BIN src/plugins/globe/data/worldwind_srtm/0/0014/0014_0000.bil
  163. BIN src/plugins/globe/data/worldwind_srtm/0/0014/0014_0001.bil
  164. BIN src/plugins/globe/data/worldwind_srtm/0/0014/0014_0002.bil
  165. BIN src/plugins/globe/data/worldwind_srtm/0/0014/0014_0003.bil
  166. BIN src/plugins/globe/data/worldwind_srtm/0/0014/0014_0004.bil
  167. BIN src/plugins/globe/data/worldwind_srtm/0/0014/0014_0005.bil
  168. BIN src/plugins/globe/data/worldwind_srtm/0/0014/0014_0006.bil
  169. BIN src/plugins/globe/data/worldwind_srtm/0/0014/0014_0007.bil
  170. BIN src/plugins/globe/data/worldwind_srtm/0/0014/0014_0008.bil
  171. BIN src/plugins/globe/data/worldwind_srtm/0/0015/0015_0000.bil
  172. BIN src/plugins/globe/data/worldwind_srtm/0/0015/0015_0001.bil
  173. BIN src/plugins/globe/data/worldwind_srtm/0/0015/0015_0002.bil
  174. BIN src/plugins/globe/data/worldwind_srtm/0/0015/0015_0003.bil
  175. BIN src/plugins/globe/data/worldwind_srtm/0/0015/0015_0004.bil
  176. BIN src/plugins/globe/data/worldwind_srtm/0/0015/0015_0005.bil
  177. BIN src/plugins/globe/data/worldwind_srtm/0/0015/0015_0006.bil
  178. BIN src/plugins/globe/data/worldwind_srtm/0/0015/0015_0007.bil
  179. BIN src/plugins/globe/data/worldwind_srtm/0/0015/0015_0008.bil
  180. BIN src/plugins/globe/data/worldwind_srtm/0/0016/0016_0000.bil
  181. BIN src/plugins/globe/data/worldwind_srtm/0/0016/0016_0001.bil
  182. BIN src/plugins/globe/data/worldwind_srtm/0/0016/0016_0002.bil
  183. BIN src/plugins/globe/data/worldwind_srtm/0/0016/0016_0003.bil
  184. BIN src/plugins/globe/data/worldwind_srtm/0/0016/0016_0004.bil
  185. BIN src/plugins/globe/data/worldwind_srtm/0/0016/0016_0005.bil
  186. BIN src/plugins/globe/data/worldwind_srtm/0/0016/0016_0006.bil
  187. BIN src/plugins/globe/data/worldwind_srtm/0/0016/0016_0007.bil
  188. BIN src/plugins/globe/data/worldwind_srtm/0/0016/0016_0008.bil
  189. BIN src/plugins/globe/data/worldwind_srtm/0/0017/0017_0000.bil
  190. BIN src/plugins/globe/data/worldwind_srtm/0/0017/0017_0001.bil
  191. BIN src/plugins/globe/data/worldwind_srtm/0/0017/0017_0002.bil
  192. BIN src/plugins/globe/data/worldwind_srtm/0/0017/0017_0003.bil
  193. BIN src/plugins/globe/data/worldwind_srtm/0/0017/0017_0004.bil
  194. BIN src/plugins/globe/data/worldwind_srtm/0/0017/0017_0005.bil
  195. BIN src/plugins/globe/data/worldwind_srtm/0/0017/0017_0006.bil
  196. BIN src/plugins/globe/data/worldwind_srtm/0/0017/0017_0007.bil
  197. BIN src/plugins/globe/data/worldwind_srtm/0/0017/0017_0008.bil
  198. +1,059 −0 src/plugins/globe/globe_plugin.cpp
  199. +217 −0 src/plugins/globe/globe_plugin.h
  200. +6 −0 src/plugins/globe/globe_plugin.qrc
  201. +589 −0 src/plugins/globe/globe_plugin_dialog.cpp
  202. +95 −0 src/plugins/globe/globe_plugin_dialog.h
  203. +654 −0 src/plugins/globe/globe_plugin_dialog_guibase.ui
  204. BIN src/plugins/globe/images/globe.png
  205. BIN src/plugins/globe/images/gui/move-down.png
  206. BIN src/plugins/globe/images/gui/move-left.png
  207. BIN src/plugins/globe/images/gui/move-right.png
  208. BIN src/plugins/globe/images/gui/move-up.png
  209. BIN src/plugins/globe/images/gui/refresh-view.png
  210. BIN src/plugins/globe/images/gui/rotate-ccw.png
  211. BIN src/plugins/globe/images/gui/rotate-cw.png
  212. BIN src/plugins/globe/images/gui/rotate-reset.png
  213. BIN src/plugins/globe/images/gui/sync-extent.png
  214. BIN src/plugins/globe/images/gui/tilt-down.png
  215. BIN src/plugins/globe/images/gui/tilt-up.png
  216. BIN src/plugins/globe/images/gui/zoom-home.png
  217. BIN src/plugins/globe/images/gui/zoom-in.png
  218. BIN src/plugins/globe/images/gui/zoom-out.png
  219. BIN src/plugins/globe/images/originals/gui/move-down.png
  220. BIN src/plugins/globe/images/originals/gui/move-left.png
  221. BIN src/plugins/globe/images/originals/gui/move-right.png
  222. BIN src/plugins/globe/images/originals/gui/move-up.png
  223. BIN src/plugins/globe/images/originals/gui/refresh-view.png
  224. BIN src/plugins/globe/images/originals/gui/rotate-ccw.png
  225. BIN src/plugins/globe/images/originals/gui/rotate-cw.png
  226. BIN src/plugins/globe/images/originals/gui/rotate-reset.png
  227. BIN src/plugins/globe/images/originals/gui/sync-extent.png
  228. BIN src/plugins/globe/images/originals/gui/tilt-down.png
  229. BIN src/plugins/globe/images/originals/gui/tilt-up.png
  230. BIN src/plugins/globe/images/originals/gui/zoom-home.png
  231. BIN src/plugins/globe/images/originals/gui/zoom-in.png
  232. BIN src/plugins/globe/images/originals/gui/zoom-out.png
  233. BIN src/plugins/globe/images/world.tif
  234. +168 −0 src/plugins/globe/qgsosgearthtilesource.cpp
  235. +59 −0 src/plugins/globe/qgsosgearthtilesource.h
  236. +116 −0 src/plugins/globe/qgsosgviewer.cpp
  237. +107 −0 src/plugins/globe/qgsosgviewer.h
  238. +5 −5 src/providers/postgres/qgspostgresprovider.cpp
@@ -76,6 +76,11 @@ 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")
IF (WITH_GLOBE)
FIND_PACKAGE(OSGEARTH)
ENDIF (WITH_GLOBE)

# Compile flag. Make it possible to turn it off.
SET (PEDANTIC TRUE CACHE BOOL "Determines if we should compile in pedantic mode.")

@@ -0,0 +1,101 @@
# This module defines

# OSGEARTH_LIBRARY
# OSGEARTH_FOUND, if false, do not try to link to osg
# OSGEARTH_INCLUDE_DIRS, where to find the headers
# OSGEARTH_INCLUDE_DIR, where to find the source headers
# OSGEARTH_GEN_INCLUDE_DIR, where to find the generated headers

# to use this module, set variables to point to the osg build
# directory, and source directory, respectively
# OSGEARTHDIR or OSGEARTH_SOURCE_DIR: osg source directory, typically OpenSceneGraph
# OSGEARTH_DIR or OSGEARTH_BUILD_DIR: osg build directory, place in which you've
# built osg via cmake

# Header files are presumed to be included like
# #include <osgEarth/Common>
# #include <osgEarth/TileSource>

###### headers ######

MACRO( FIND_OSGEARTH_INCLUDE THIS_OSGEARTH_INCLUDE_DIR THIS_OSGEARTH_INCLUDE_FILE )

FIND_PATH( ${THIS_OSGEARTH_INCLUDE_DIR} ${THIS_OSGEARTH_INCLUDE_FILE}
PATHS
${OSGEARTH_DIR}
$ENV{OSGEARTH_SOURCE_DIR}
$ENV{OSGEARTHDIR}
$ENV{OSGEARTH_DIR}
/usr/local/
/usr/
/sw/ # Fink
/opt/local/ # DarwinPorts
/opt/csw/ # Blastwave
/opt/
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSGEARTH_ROOT]/
~/Library/Frameworks
/Library/Frameworks
PATH_SUFFIXES
/include/
)

ENDMACRO( FIND_OSGEARTH_INCLUDE THIS_OSGEARTH_INCLUDE_DIR THIS_OSGEARTH_INCLUDE_FILE )

FIND_OSGEARTH_INCLUDE( OSGEARTH_GEN_INCLUDE_DIR osgEarth/Common )
FIND_OSGEARTH_INCLUDE( OSGEARTH_INCLUDE_DIR osgEarth/TileSource )

###### libraries ######

MACRO( FIND_OSGEARTH_LIBRARY MYLIBRARY MYLIBRARYNAME )

FIND_LIBRARY(${MYLIBRARY}
NAMES
${MYLIBRARYNAME}
PATHS
${OSGEARTH_DIR}
$ENV{OSGEARTH_BUILD_DIR}
$ENV{OSGEARTH_DIR}
$ENV{OSGEARTHDIR}
$ENV{OSGEARTH_ROOT}
~/Library/Frameworks
/Library/Frameworks
/usr/local
/usr
/sw
/opt/local
/opt/csw
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSGEARTH_ROOT]/lib
/usr/freeware
PATH_SUFFIXES
/lib/
/lib64/
/build/lib/
/build/lib64/
/Build/lib/
/Build/lib64/
)

ENDMACRO(FIND_OSGEARTH_LIBRARY LIBRARY LIBRARYNAME)

FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY osgEarth )
FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY_DEBUG osgEarthd)

FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY osgEarthUtil )
FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY_DEBUG osgEarthUtild)

FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY osgEarthFeatures )
FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY_DEBUG osgEarthFeaturesd)

FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY osgEarthSymbology )
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY_DEBUG osgEarthSymbologyd )


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} )
GET_FILENAME_COMPONENT( OSGEARTH_LIBRARIES_DIR ${OSGEARTH_LIBRARY} PATH )
ENDIF( OSGEARTH_LIBRARY AND OSGEARTH_INCLUDE_DIR )


@@ -1,12 +1,12 @@
## Once run this will define:
##
## Once run this will define:
##
## QGIS_FOUND = system has QGIS lib
##
## QGIS_CORE_LIBRARY = full path to the CORE library
## QGIS_GUI_LIBRARY = full path to the GUI library
## QGIS_ANALYSIS_LIBRARY = full path to the ANALYSIS library
## QGIS_PLUGIN_DIR = full path to where QGIS plugins are installed
## QGIS_INCLUDE_DIR = where to find headers
## QGIS_INCLUDE_DIR = where to find headers
##
## Tim Sutton

@@ -20,9 +20,9 @@ IF(WIN32)
"$ENV{PROGRAMFILES}/Quantum GIS/plugins"
)
FIND_PATH(QGIS_INCLUDE_DIR
NAMES qgsapplication.h
NAMES qgsapplication.h
PATHS
"$ENV{PROGRAMFILES}/Quantum GIS/include"
"$ENV{PROGRAMFILES}/Quantum GIS/include"
)
FIND_LIBRARY(QGIS_CORE_LIBRARY
NAMES qgis_core
@@ -43,41 +43,41 @@ IF(WIN32)
"$ENV{OSGEO4W_ROOT}/apps/qgis/plugins"
"$ENV{PROGRAMFILES}/Quantum GIS/plugins"
)
FIND_PATH(QGIS_INCLUDE_DIR
NAMES qgsapplication.h
FIND_PATH(QGIS_INCLUDE_DIR
NAMES qgsapplication.h
PATHS
"$ENV{INCLUDE}"
"$ENV{LIB_DIR}/include/qgis"
"$ENV{INCLUDE}"
"$ENV{LIB_DIR}/include/qgis"
"$ENV{OSGEO4W_ROOT}/include"
"$ENV{PROGRAMFILES}/Quantum GIS/include"
)
FIND_LIBRARY(QGIS_CORE_LIBRARY
NAMES qgis_core
PATHS
"$ENV{LIB_DIR}/lib/"
"$ENV{LIB}"
PATHS
"$ENV{LIB_DIR}/lib/"
"$ENV{LIB}"
"$ENV{OSGEO4W_ROOT}/lib"
"$ENV{PROGRAMFILES}/Quantum GIS/lib"
)
FIND_LIBRARY(QGIS_GUI_LIBRARY
NAMES qgis_gui
PATHS
"$ENV{LIB_DIR}"
"$ENV{LIB}"
PATHS
"$ENV{LIB_DIR}"
"$ENV{LIB}"
"$ENV{OSGEO4W_ROOT}/lib"
"$ENV{PROGRAMFILES}/Quantum GIS/lib"
)
FIND_LIBRARY(QGIS_ANALYSIS_LIBRARY
NAMES qgis_analysis
PATHS
"$ENV{LIB_DIR}"
"$ENV{LIB}"
PATHS
"$ENV{LIB_DIR}"
"$ENV{LIB}"
"$ENV{OSGEO4W_ROOT}/lib"
"$ENV{PROGRAMFILES}/Quantum GIS/lib"
)
ENDIF (MSVC)
ELSE(WIN32)
IF(UNIX)
IF(UNIX)
# try to use bundle on mac
SET (QGIS_MAC_PATH /Applications/QGIS.app/Contents)
#MESSAGE("Searching for QGIS in /usr/bin; /usr/local/bin")
@@ -88,25 +88,25 @@ ELSE(WIN32)
/usr/lib/qgis
/usr/local/lib/qgis/plugins
${QGIS_MAC_PATH}/PlugIns/qgis
"$ENV{LIB_DIR}/lib/qgis/plugins"
"$ENV{LIB_DIR}/lib/qgis"
"$ENV{LIB_DIR}/lib/qgis/plugins"
"$ENV{LIB_DIR}/lib/qgis"
)
FIND_PATH(QGIS_INCLUDE_DIR
NAMES qgis.h
NAMES qgis.h
PATHS
/usr/include/qgis
/usr/local/include/qgis
${QGIS_MAC_PATH}/Frameworks/qgis_core.framework/Headers
"$ENV{LIB_DIR}/include/qgis"
"$ENV{LIB_DIR}/include/qgis"
)
# also get other frameworks' headers folders on OS X
IF (APPLE)
FIND_PATH(QGIS_GUI_INCLUDE_DIR
NAMES qgisgui.h
NAMES qgisgui.h
PATHS ${QGIS_MAC_PATH}/Frameworks/qgis_gui.framework/Headers
)
FIND_PATH(QGIS_ANALYSIS_INCLUDE_DIR
NAMES qgsinterpolator.h
NAMES qgsinterpolator.h
PATHS ${QGIS_MAC_PATH}/Frameworks/qgis_analysis.framework/Headers
)
SET(QGIS_INCLUDE_DIR
@@ -117,30 +117,30 @@ ELSE(WIN32)
ENDIF (APPLE)
FIND_LIBRARY(QGIS_CORE_LIBRARY
NAMES qgis_core
PATHS
PATHS
/usr/lib64
/usr/lib
/usr/local/lib
${QGIS_MAC_PATH}/Frameworks
"$ENV{LIB_DIR}/lib/"
"$ENV{LIB_DIR}/lib/"
)
FIND_LIBRARY(QGIS_GUI_LIBRARY
NAMES qgis_gui
PATHS
PATHS
/usr/lib64
/usr/lib
/usr/local/lib
${QGIS_MAC_PATH}/Frameworks
"$ENV{LIB_DIR}/lib/"
"$ENV{LIB_DIR}/lib/"
)
FIND_LIBRARY(QGIS_ANALYSIS_LIBRARY
NAMES qgis_analysis
PATHS
PATHS
/usr/lib64
/usr/lib
/usr/local/lib
${QGIS_MAC_PATH}/Frameworks
"$ENV{LIB_DIR}/lib/"
"$ENV{LIB_DIR}/lib/"
)
ENDIF(UNIX)
ENDIF(WIN32)
@@ -1,13 +1,13 @@

FILE (GLOB IMAGES *.png)
INSTALL (FILES ${IMAGES}
DESTINATION ${QGIS_DATA_DIR}/images/icons)

IF(MSVC)
INSTALL(FILES qgis.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons)
ENDIF(MSVC)

# OS X app/doc icons
IF (APPLE)
ADD_SUBDIRECTORY(mac)
ENDIF (APPLE)

FILE (GLOB IMAGES *.png)
INSTALL (FILES ${IMAGES}
DESTINATION ${QGIS_DATA_DIR}/images/icons)

IF(MSVC)
INSTALL(FILES qgis.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons)
ENDIF(MSVC)

# OS X app/doc icons
IF (APPLE)
ADD_SUBDIRECTORY(mac)
ENDIF (APPLE)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -31,7 +31,7 @@ IF (NOT APPLE)
TARGET_LINK_LIBRARIES(pyspatialite ${PYTHON_LIBRARY})
ENDIF (NOT APPLE)

TARGET_LINK_LIBRARIES(pyspatialite ${EXTRA_LINK_LIBRARIES})
TARGET_LINK_LIBRARIES(pyspatialite qgis_core)

IF (APPLE)
SET_TARGET_PROPERTIES(pyspatialite PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
@@ -423,6 +423,10 @@ INSTALL(TARGETS ${QGIS_APP_NAME}
BUNDLE DESTINATION ${QGIS_INSTALL_PREFIX}
RUNTIME DESTINATION ${QGIS_BIN_DIR})

IF (MSVC)
INSTALL(FILES qgis.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons)
ENDIF (MSVC)

IF (APPLE)
INSTALL(CODE "EXECUTE_PROCESS(COMMAND /bin/echo -n \"APPLQGIS\" OUTPUT_FILE \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/../PkgInfo\")")
ENDIF (APPLE)
@@ -494,7 +494,7 @@ class QgsPaintEngineHack : public QPaintEngine
gccaps |= ( QPaintEngine::PrimitiveTransform
// | QPaintEngine::PatternTransform
| QPaintEngine::PixmapTransform
// | QPaintEngine::PatternBrush
| QPaintEngine::PatternBrush
// | QPaintEngine::LinearGradientFill
// | QPaintEngine::RadialGradientFill
// | QPaintEngine::ConicalGradientFill
@@ -552,11 +552,10 @@ void QgsComposer::on_mActionExportAsPDF_triggered()
printer.setPaperSize( QSizeF( mComposition->paperWidth(), mComposition->paperHeight() ), QPrinter::Millimeter );

QPaintEngine *engine = printer.paintEngine();
if ( engine && engine->hasFeature( QPaintEngine::PatternTransform ) )
if ( engine )
{
QgsPaintEngineHack *hack = static_cast<QgsPaintEngineHack*>( engine );
hack->fixFlags();
Q_ASSERT( !engine->hasFeature( QPaintEngine::PatternTransform ) );
}

print( printer );
@@ -345,15 +345,15 @@ QString QgsPgSourceSelect::layerURI( const QModelIndex &index )

if ( typeName == "POINT" )
{
geomFilter = QString( "geometrytype(\"%1\") IN ('POINT','MULTIPOINT')" ).arg( geomColumnName );
geomFilter = QString( "upper(geometrytype(\"%1\")) IN ('POINT','MULTIPOINT')" ).arg( geomColumnName );
}
else if ( typeName == "LINESTRING" )
{
geomFilter = QString( "geometrytype(\"%1\") IN ('LINESTRING','MULTILINESTRING')" ).arg( geomColumnName );
geomFilter = QString( "upper(geometrytype(\"%1\")) IN ('LINESTRING','MULTILINESTRING')" ).arg( geomColumnName );
}
else if ( typeName == "POLYGON" )
{
geomFilter = QString( "geometrytype(\"%1\") IN ('POLYGON','MULTIPOLYGON')" ).arg( geomColumnName );
geomFilter = QString( "upper(geometrytype(\"%1\")) IN ('POLYGON','MULTIPOLYGON')" ).arg( geomColumnName );
}

if ( !geomFilter.isEmpty() && !sql.contains( geomFilter ) )
@@ -972,9 +972,9 @@ void QgsGeomColumnTypeThread::getLayerTypes()
{
QString query = QString( "select distinct "
"case"
" when geometrytype(%1) IN ('POINT','MULTIPOINT') THEN 'POINT'"
" when geometrytype(%1) IN ('LINESTRING','MULTILINESTRING') THEN 'LINESTRING'"
" when geometrytype(%1) IN ('POLYGON','MULTIPOLYGON') THEN 'POLYGON'"
" when upper(geometrytype(%1)) IN ('POINT','MULTIPOINT') THEN 'POINT'"
" when upper(geometrytype(%1)) IN ('LINESTRING','MULTILINESTRING') THEN 'LINESTRING'"
" when upper(geometrytype(%1)) IN ('POLYGON','MULTIPOLYGON') THEN 'POLYGON'"
" end "
"from " ).arg( "\"" + columns[i] + "\"" );
if ( mUseEstimatedMetadata )

0 comments on commit bff8e54

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