Skip to content
Permalink
Browse files

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

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

@@ -269,16 +274,19 @@ ELSE (WIN32)

IF (APPLE)
# for Mac OS X, everything is put inside an application bundle
# save the root install prefix for the app later
SET (QGIS_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
SET (QGIS_MACAPP_PREFIX ${CMAKE_INSTALL_PREFIX}/${QGIS_APP_NAME}.app/Contents)
# common prefix for components, let cmake handle it
SET (CMAKE_INSTALL_PREFIX ${QGIS_MACAPP_PREFIX}/MacOS)
# path for library references
SET (CMAKE_INSTALL_NAME_DIR @executable_path/lib)
# 4 bundling levels, each includes previous
# 0 nothing
# 1 Qt frameworks
# 2 non-system libraries, "standard"
# 3 non-system frameworks, "standalone"
SET (QGIS_MACAPP_BUNDLE 0 CACHE STRING "What to bundle into app package")
SET (QGIS_MACAPP_BUNDLE 1 CACHE STRING "What to bundle into app package")
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+)
IF (CMAKE_SYSTEM_VERSION VERSION_GREATER 9.0.0 OR CMAKE_SYSTEM_VERSION VERSION_EQUAL 9.0.0)
SET (OSX_HAVE_LOADERPATH 1)
@@ -303,6 +311,8 @@ ELSE (WIN32)
SET (DEFAULT_PLUGIN_SUBDIR ../PlugIns/qgis)
SET (QGIS_PLUGIN_SUBDIR_REV ../../MacOS)
SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
# path for framework references
SET (CMAKE_INSTALL_NAME_DIR @executable_path/${QGIS_FW_SUBDIR})

ELSE (APPLE)
# UNIX
@@ -367,12 +377,12 @@ SET (QGIS_PLUGIN_DIR ${QGIS_PLUGIN_SUBDIR})
SET (QGIS_INCLUDE_DIR ${QGIS_INCLUDE_SUBDIR})

# manual page - makes sense only on unix systems
IF (UNIX)
IF (UNIX AND NOT APPLE)
SET (DEFAULT_MANUAL_SUBDIR man)
SET (QGIS_MANUAL_SUBDIR ${DEFAULT_MANUAL_SUBDIR} CACHE STRING "Subdirectory where manual files will be installed")
MARK_AS_ADVANCED (QGIS_MANUAL_SUBDIR)
SET (QGIS_MANUAL_DIR ${CMAKE_INSTALL_PREFIX}/${QGIS_MANUAL_SUBDIR})
ENDIF (UNIX)
ENDIF (UNIX AND NOT APPLE)

#############################################################
# Python bindings
@@ -402,9 +412,9 @@ ENDIF (WITH_BINDINGS)

#############################################################
# create qgsconfig.h
# installed with app target

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/qgsconfig.h.in ${CMAKE_BINARY_DIR}/qgsconfig.h)
INSTALL(FILES ${CMAKE_BINARY_DIR}/qgsconfig.h DESTINATION ${QGIS_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})

# Added by Jef to prevent python core and gui libs linking to other qgisCore and qgisGui libs
@@ -427,18 +437,22 @@ IF (GIT_MARKER)
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
ELSE(MSVC)
EXECUTE_PROCESS(COMMAND ${GIT} log -n1 --pretty=%h OUTPUT_VARIABLE REVISION)
STRING(STRIP "${REVISION}" REVISION)
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
COMMAND echo \\\#define QGSVERSION \\\"$$\( ${GIT} log -n1 --pretty=%h \)\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
COMMAND echo \\\#define QGSVERSION \\\"${REVISION}\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
MAIN_DEPENDENCY ${GIT_MARKER}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
ENDIF(MSVC)
ELSE(GIT)
MESSAGE(STATUS "git marker, but no git found - version will be unknown")
SET(REVISION "unknown")
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"unknown\"")
ENDIF(GIT)
ELSE (GIT_MARKER)
SET(REVISION "exported")
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"exported\"")
ENDIF (GIT_MARKER)

@@ -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,11 +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

@@ -19,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
@@ -42,91 +43,117 @@ 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}"
"$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")
FIND_PATH(QGIS_PLUGIN_DIR
NAMES libnortharrowplugin.so
PATHS
/usr/lib64/qgis/plugins
/usr/lib/qgis
/usr/local/lib/qgis/plugins
${QGIS_MAC_PATH}/PlugIns/qgis
"$ENV{LIB_DIR}/lib/qgis/plugins"
"$ENV{LIB_DIR}/lib/qgis"
)
FIND_PATH(QGIS_INCLUDE_DIR
NAMES qgis.h
PATHS
/usr/include/qgis
/usr/local/include/qgis
${QGIS_MAC_PATH}/Frameworks/qgis_core.framework/Headers
"$ENV{LIB_DIR}/include/qgis"
)
# also get other frameworks' headers folders on OS X
IF (APPLE)
#MESSAGE("Searching for QGIS in /Applications/QGIS.app/Contents/MacOS")
#SET (QGIS_MAC_PATH /Applications/qgis1.0.0.app/Contents/MacOS)
SET (QGIS_MAC_PATH /Applications/qgis1.1.0.app/Contents/MacOS)
SET (QGIS_LIB_DIR ${QGIS_MAC_PATH}/lib)
SET (QGIS_PLUGIN_DIR ${QGIS_MAC_PATH}/lib/qgis CACHE STRING INTERNAL)
# set INCLUDE_DIR to prefix+include
SET(QGIS_INCLUDE_DIR ${QGIS_MAC_PATH}/include/qgis CACHE STRING INTERNAL)
## extract link dirs
SET(QGIS_CORE_LIBRARY ${QGIS_LIB_DIR}/libqgis_core.dylib CACHE STRING INTERNAL)
SET(QGIS_GUI_LIBRARY ${QGIS_LIB_DIR}/libqgis_gui.dylib CACHE STRING INTERNAL)
ELSE (APPLE)
#MESSAGE("Searching for QGIS in /usr/bin; /usr/local/bin")
FIND_PATH(QGIS_PLUGIN_DIR
NAMES libnortharrowplugin.so
PATHS
/usr/lib64/qgis/plugins
/usr/lib/qgis
/usr/local/lib/qgis/plugins
"$ENV{LIB_DIR}/lib/qgis/plugins"
"$ENV{LIB_DIR}/lib/qgis"
FIND_PATH(QGIS_GUI_INCLUDE_DIR
NAMES qgisgui.h
PATHS ${QGIS_MAC_PATH}/Frameworks/qgis_gui.framework/Headers
)
FIND_PATH(QGIS_INCLUDE_DIR
NAMES qgis.h
PATHS
/usr/include/qgis
/usr/local/include/qgis
"$ENV{LIB_DIR}/include/qgis"
FIND_PATH(QGIS_ANALYSIS_INCLUDE_DIR
NAMES qgsinterpolator.h
PATHS ${QGIS_MAC_PATH}/Frameworks/qgis_analysis.framework/Headers
)
FIND_LIBRARY(QGIS_CORE_LIBRARY
NAMES qgis_core
PATHS
/usr/lib64
/usr/lib
/usr/local/lib
"$ENV{LIB_DIR}/lib/"
)
FIND_LIBRARY(QGIS_GUI_LIBRARY
NAMES qgis_gui
PATHS
/usr/lib64
/usr/lib
/usr/local/lib
"$ENV{LIB_DIR}/lib/"
SET(QGIS_INCLUDE_DIR
${QGIS_INCLUDE_DIR}
${QGIS_GUI_INCLUDE_DIR}
${QGIS_ANALYSIS_INCLUDE_DIR}
)
ENDIF (APPLE)
FIND_LIBRARY(QGIS_CORE_LIBRARY
NAMES qgis_core
PATHS
/usr/lib64
/usr/lib
/usr/local/lib
${QGIS_MAC_PATH}/Frameworks
"$ENV{LIB_DIR}/lib/"
)
FIND_LIBRARY(QGIS_GUI_LIBRARY
NAMES qgis_gui
PATHS
/usr/lib64
/usr/lib
/usr/local/lib
${QGIS_MAC_PATH}/Frameworks
"$ENV{LIB_DIR}/lib/"
)
FIND_LIBRARY(QGIS_ANALYSIS_LIBRARY
NAMES qgis_analysis
PATHS
/usr/lib64
/usr/lib
/usr/local/lib
${QGIS_MAC_PATH}/Frameworks
"$ENV{LIB_DIR}/lib/"
)
ENDIF(UNIX)
ENDIF(WIN32)

IF (QGIS_INCLUDE_DIR AND QGIS_CORE_LIBRARY AND QGIS_GUI_LIBRARY)
IF (QGIS_INCLUDE_DIR AND QGIS_CORE_LIBRARY AND QGIS_GUI_LIBRARY AND QGIS_ANALYSIS_LIBRARY)
SET(QGIS_FOUND TRUE)
ENDIF (QGIS_INCLUDE_DIR AND QGIS_CORE_LIBRARY AND QGIS_GUI_LIBRARY)
ENDIF ()

IF (QGIS_FOUND)
IF (NOT QGIS_FIND_QUIETLY)
MESSAGE(STATUS "Found QGIS core: ${QGIS_CORE_LIBRARY}")
MESSAGE(STATUS "Found QGIS gui: ${QGIS_GUI_LIBRARY}")
MESSAGE(STATUS "Found QGIS analysis: ${QGIS_ANALYSIS_LIBRARY}")
MESSAGE(STATUS "Found QGIS plugins directory: ${QGIS_PLUGIN_DIR}")
ENDIF (NOT QGIS_FIND_QUIETLY)
ELSE (QGIS_FOUND)

0 comments on commit d56e4e9

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