From ca5c93a983e1a0fddde6730eaf1ab5615c1ea6db Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 17 Nov 2008 15:53:04 +0000 Subject: [PATCH] Removed dependency on GLUT. --- examples/CMakeLists.txt | 4 ++-- examples/osgbrowser/CMakeLists.txt | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 0a0fe271b..a72d42d6f 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -112,9 +112,9 @@ IF(DYNAMIC_OPENSCENEGRAPH) ADD_SUBDIRECTORY(osgpdf) ENDIF(POPPLER_FOUND AND CAIRO_FOUND) - IF (XUL_FOUND AND GTKGL_FOUND AND GLUT_FOUND) + IF (XUL_FOUND AND GTKGL_FOUND) ADD_SUBDIRECTORY(osgbrowser) - ENDIF(XUL_FOUND AND GTKGL_FOUND AND GLUT_FOUND) + ENDIF(XUL_FOUND AND GTKGL_FOUND) IF (BUILD_OSG_WRAPPERS) diff --git a/examples/osgbrowser/CMakeLists.txt b/examples/osgbrowser/CMakeLists.txt index 8917b37ec..a6412a448 100644 --- a/examples/osgbrowser/CMakeLists.txt +++ b/examples/osgbrowser/CMakeLists.txt @@ -21,8 +21,7 @@ ADD_DEFINITIONS(-DMOZILLA_INTERNAL_API) # MESSAGE("XUL_LIBRARIES = " ${XUL_LIBRARIES}) # MESSAGE("XUL_INCLUDE_DIRS = " ${XUL_INCLUDE_DIRS}) -INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_DIR} - ${GTK_INCLUDE_DIRS} ${GTKGL_INCLUDE_DIRS} +INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS} ${XUL_INCLUDE_DIRS} /usr/include/xulrunner/locale /usr/include/xulrunner/view @@ -47,7 +46,7 @@ INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_DIR} /usr/include/xulrunner/xpconnect ) LINK_DIRECTORIES( ${XUL_LIB_DIRS}) -SET(TARGET_EXTERNAL_LIBRARIES ${XUL_LIBRARIES} ${GLUT_glut_LIBRARY}) +SET(TARGET_EXTERNAL_LIBRARIES ${XUL_LIBRARIES}) #### end var setup ### SETUP_EXAMPLE(osgbrowser)