Skip to content

Commit 3fecd44

Browse files
slarosaslarosa
committedOct 19, 2012
Merge branch master of https://github.com/qgis/Quantum-GIS
·
ltr-3_40Before-merge-new_vector_api
2 parents ca20be1 + 8ca2236 commit 3fecd44

File tree

198 files changed

+82282
-10526
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+82282
-10526
lines changed
 

‎CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ SET (WITH_GLOBE FALSE CACHE BOOL "Determines whether Globe plugin should be buil
9595
IF (WITH_GLOBE)
9696
SET(QT_USE_QTOPENGL 1)
9797
FIND_PACKAGE(OSGEARTH REQUIRED)
98+
IF (OSGEARTHQT_LIBRARY)
99+
# following variable is used in qgsconfig.h
100+
SET(HAVE_OSGEARTHQT TRUE)
101+
ENDIF (OSGEARTHQT_LIBRARY)
98102
ENDIF (WITH_GLOBE)
99103

100104
# Compile flag. Make it possible to turn it off.

‎cmake/FindOSGEARTH.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY_DEBUG osgEarthFeaturesd )
9292
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY osgEarthSymbology )
9393
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY_DEBUG osgEarthSymbologyd )
9494

95+
FIND_OSGEARTH_LIBRARY( OSGEARTHQT_LIBRARY osgEarthQt )
96+
FIND_OSGEARTH_LIBRARY( OSGEARTHQT_LIBRARY_DEBUG osgEarthQtd )
97+
9598

9699
SET( OSGEARTH_FOUND "NO" )
97100
IF( OSGEARTH_LIBRARY AND OSGEARTH_INCLUDE_DIR )

0 commit comments

Comments
 (0)