fix building of globe plugin on windows

qgis · Oct 3, 2012 · 1ed1188 · 1ed1188
1 parent e71bcfc
commit 1ed1188
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/src/plugins/globe/CMakeLists.txt b/src/plugins/globe/CMakeLists.txt
@@ -29,7 +29,6 @@ SET (globe_plugin_MOC_HDRS
      globe_plugin_dialog.h
      osgEarthQt/Common
      osgEarthQt/ViewerWidget
-     osgEarthUtil/Controls
 )
 
 SET (globe_plugin_RCCS  globe_plugin.qrc)
@@ -60,6 +59,7 @@ TARGET_LINK_LIBRARIES(globeplugin
   ${QT_QTOPENGL_LIBRARY}
   ${OSGDB_LIBRARY}
   ${OSGGA_LIBRARY}
+  ${OSGUTIL_LIBRARY}
   ${OSG_LIBRARY}
   ${OSGQT_LIBRARY}
   ${OSGVIEWER_LIBRARY}

diff --git a/src/plugins/globe/CMakeModules/FindOSG.cmake b/src/plugins/globe/CMakeModules/FindOSG.cmake
@@ -106,10 +106,12 @@ FIND_OSG_LIBRARY( OSGVIEWER_LIBRARY_DEBUG osgViewerd )
 FIND_OSG_LIBRARY( OSGGA_LIBRARY osgGA )
 FIND_OSG_LIBRARY( OSGGA_LIBRARY_DEBUG osgGAd )
 
+FIND_OSG_LIBRARY( OSGQT_LIBRARY osgQT )
+FIND_OSG_LIBRARY( OSGQT_LIBRARY_DEBUG osgQTd )
+
 FIND_OSG_LIBRARY( OSGWIDGET_LIBRARY osgWidget )
 FIND_OSG_LIBRARY( OSGWIDGET_LIBRARY_DEBUG osgWidgetd )
 
-
 FIND_OSG_LIBRARY( OPENTHREADS_LIBRARY OpenThreads )
 FIND_OSG_LIBRARY( OPENTHREADS_LIBRARY_DEBUG OpenThreadsd )
 

diff --git a/src/plugins/globe/osgEarthQt/ViewerWidget b/src/plugins/globe/osgEarthQt/ViewerWidget
@@ -29,6 +29,9 @@
 
 #include <QtCore/QTimer>
 
+#undef OSGEARTHQT_EXPORT
+#define OSGEARTHQT_EXPORT
+
 namespace osgEarth { namespace QtGui 
 {
     using namespace osgEarth;

diff --git a/src/plugins/globe/osgEarthUtil/Controls b/src/plugins/globe/osgEarthUtil/Controls
@@ -34,6 +34,9 @@
 #include <vector>
 #include <queue>
 
+#undef OSGEARTHUTIL_EXPORT
+#define OSGEARTHUTIL_EXPORT
+
 /**
  * Controls - A simple 2D UI toolkit.
  *