r13947 by cbradney - Adjust OSG finder a little to make it work when OSG is not installed and WANT_NOOSG is not set, fix designer browser plugin compilation for new ui dir location

[scribus-commit]

Revision: 13947
Author: cbradney
Date: 2009-09-01T22:55:45.588010Z
Commit message: Adjust OSG finder a little to make it work when OSG is not installed and WANT_NOOSG is not set, fix designer browser plugin compilation for new ui dir location

Changeset: 
M  /trunk/Scribus/scribus/designer/scrspinboxplugin.cpp
M  /trunk/Scribus/scribus/designer/sctextbrowserplugin.cpp
M  /trunk/Scribus/scribus/designer/sctablewidgetplugin.cpp
M  /trunk/Scribus/CMakeLists.txt
M  /trunk/Scribus/cmake/modules/FindOSG.cmake
M  /trunk/Scribus/ConfigureChecks.cmake

Diffs:
Index: cmake/modules/FindOSG.cmake
===================================================================
--- cmake/modules/FindOSG.cmake	(revision 13946)
+++ cmake/modules/FindOSG.cmake	(revision 13947)
@@ -108,4 +108,6 @@
 SET(OSG_FOUND "NO")
 IF(OSG_LIBRARY AND OSG_INCLUDE_DIR)
     SET(OSG_FOUND "YES")
+ELSE(OSG_LIBRARY AND OSG_INCLUDE_DIR)
+    SET(OSG_INCLUDE_DIR "")
 ENDIF(OSG_LIBRARY AND OSG_INCLUDE_DIR)
Index: ConfigureChecks.cmake
===================================================================
--- ConfigureChecks.cmake	(revision 13946)
+++ ConfigureChecks.cmake	(revision 13947)
@@ -29,6 +29,13 @@
    set(HAVE_LIBPNG 0)
 endif(PNG_FOUND)
 
+#check for OSG
+#if(OSG_FOUND)
+#   set(HAVE_OSG 1)
+#else(OSG_FOUND)
+#   set(HAVE_OSG 0)
+#endif(OSG_FOUND)
+
 if(BZIP2_FOUND)
    set(HAVE_BZIP2_SUPPORT 1)
    if(BZIP2_NEED_PREFIX)
Index: scribus/designer/sctablewidgetplugin.cpp
===================================================================
--- scribus/designer/sctablewidgetplugin.cpp	(revision 13946)
+++ scribus/designer/sctablewidgetplugin.cpp	(revision 13947)
@@ -6,7 +6,7 @@
 */
 #include <QtPlugin>
 #include "sctablewidgetplugin.h"
-#include "sctablewidget.h"
+#include "../ui/sctablewidget.h"
 
 ScTableWidgetPlugin::ScTableWidgetPlugin(QObject* parent)
 	: QObject(parent), initialized(false)
Index: scribus/designer/scrspinboxplugin.cpp
===================================================================
--- scribus/designer/scrspinboxplugin.cpp	(revision 13946)
+++ scribus/designer/scrspinboxplugin.cpp	(revision 13947)
@@ -6,7 +6,7 @@
 */
 #include <QtPlugin>
 #include "scrspinboxplugin.h"
-#include "../scrspinbox.h"
+#include "../ui/scrspinbox.h"
 
 
 ScrSpinBoxPlugin::ScrSpinBoxPlugin(QObject* parent)
Index: scribus/designer/sctextbrowserplugin.cpp
===================================================================
--- scribus/designer/sctextbrowserplugin.cpp	(revision 13946)
+++ scribus/designer/sctextbrowserplugin.cpp	(revision 13947)
@@ -6,7 +6,7 @@
 */
 #include <QtPlugin>
 #include "sctextbrowserplugin.h"
-#include "sctextbrowser.h"
+#include "../ui/sctextbrowser.h"
 
 ScTextBrowserPlugin::ScTextBrowserPlugin(QObject* parent)
 	: QObject(parent), initialized(false)
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 13946)
+++ CMakeLists.txt	(revision 13947)
@@ -485,10 +485,10 @@
   IF(OSG_FOUND)
     MESSAGE("OSG found OK")
     SET(HAVE_OSG 1)
+    FIND_PACKAGE(OpenGL)
   ELSE(OSG_FOUND)
     MESSAGE("No OSG found, building without 3D-Extension")
   ENDIF(OSG_FOUND)
-  FIND_PACKAGE(OpenGL)
 ENDIF (WANT_NOOSG)
 
 #<< JPEG, TIFF, PYTHON