FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed osgbrowser example to use a local CMakeModules/FindXUL.cmake script,

Browse Source 
and specialization of GTK dependencies to only non Windows/OSX platforms.
This commit is contained in:
Robert Osfield
2008-11-18 23:38:18 +00:00
parent a36ff70df4
commit 297dd32011
5 changed files with 199 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/CMakeLists.txt
View File

@@ -112,10 +112,11 @@ IF(DYNAMIC_OPENSCENEGRAPH)
ADD_SUBDIRECTORY(osgpdf)
ENDIF(POPPLER_FOUND AND CAIRO_FOUND)
IF (XUL_FOUND AND GTKGL_FOUND)
ADD_SUBDIRECTORY(osgbrowser)
ENDIF(XUL_FOUND AND GTKGL_FOUND)
IF(XUL_FOUND)
IF (WIN32 OR APPLE OR GTK_FOUND)
ADD_SUBDIRECTORY(osgbrowser)
ENDIF(WIN32 OR APPLE OR GTK_FOUND)
ENDIF(XUL_FOUND)
IF (BUILD_OSG_WRAPPERS)
ADD_SUBDIRECTORY(osgintrospection)

65
examples/osgbrowser/CMakeLists.txt
View File

@@ -17,36 +17,45 @@ SET(TARGET_H
ADD_DEFINITIONS(-DMOZILLA_INTERNAL_API)
# MESSAGE("XUL_LIB_DIRS = " ${XUL_LIB_DIRS})
# MESSAGE("XUL_LIBRARIES = " ${XUL_LIBRARIES})
# MESSAGE("XUL_INCLUDE_DIRS = " ${XUL_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS}
SET(ALL_REQUIRED_XUL_INCLUDE_DIRS
${XUL_INCLUDE_DIRS}
/usr/include/xulrunner/locale
/usr/include/xulrunner/view
/usr/include/xulrunner/content
/usr/include/xulrunner/gfx
/usr/include/xulrunner/layout
/usr/include/xulrunner/webbrwsr
/usr/include/xulrunner/widget
/usr/include/xulrunner/dom
/usr/include/xulrunner/docshell
/usr/include/xulrunner/pref
/usr/include/xulrunner/nkcache
/usr/include/xulrunner/necko/
/usr/include/xulrunner/profdirserviceprovider
/usr/include/xulrunner/nkcache
/usr/include/xulrunner/xulapp
/usr/include/xulrunner/profile
/usr/include/xulrunner/appshell
/usr/include/xulrunner/xpcom_obsolete
/usr/include/xulrunner/intl
/usr/include/xulrunner/windowwatcher
/usr/include/xulrunner/xpconnect
${XUL_INCLUDE_DIR}/xpcom
${XUL_INCLUDE_DIR}/string
${XUL_INCLUDE_DIR}/locale
${XUL_INCLUDE_DIR}/view
${XUL_INCLUDE_DIR}/content
${XUL_INCLUDE_DIR}/gfx
${XUL_INCLUDE_DIR}/layout
${XUL_INCLUDE_DIR}/webbrwsr
${XUL_INCLUDE_DIR}/widget
${XUL_INCLUDE_DIR}/dom
${XUL_INCLUDE_DIR}/docshell
${XUL_INCLUDE_DIR}/pref
${XUL_INCLUDE_DIR}/nkcache
${XUL_INCLUDE_DIR}/necko/
${XUL_INCLUDE_DIR}/profdirserviceprovider
${XUL_INCLUDE_DIR}/nkcache
${XUL_INCLUDE_DIR}/xulapp
${XUL_INCLUDE_DIR}/profile
${XUL_INCLUDE_DIR}/appshell
${XUL_INCLUDE_DIR}/xpcom_obsolete
${XUL_INCLUDE_DIR}/intl
${XUL_INCLUDE_DIR}/windowwatcher
${XUL_INCLUDE_DIR}/xpconnect
)
LINK_DIRECTORIES( ${XUL_LIB_DIRS})
SET(TARGET_EXTERNAL_LIBRARIES ${XUL_LIBRARIES})
IF (WIN32 OR APPLE)
INCLUDE_DIRECTORIES(${ALL_REQUIRED_XUL_INCLUDE_DIRS} )
SET(TARGET_EXTERNAL_LIBRARIES ${XUL_LIBRARIES})
ELSE(WIN32 OR APPLE)
INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS} ${ALL_REQUIRED_XUL_INCLUDE_DIRS} )
SET(TARGET_EXTERNAL_LIBRARIES ${GTK_LIBRARIES} ${XUL_LIBRARIES})
ENDIF(WIN32 OR APPLE)
#### end var setup ###
SETUP_EXAMPLE(osgbrowser)