From e457914a40686d8ede236f877fdd50fafa3bc055 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 22 Mar 2007 14:06:27 +0000 Subject: [PATCH] Added CMake build support for GLUT and SDL examples --- examples/CMakeLists.txt | 32 ++++++++++---------- examples/osgGLUTkeyboardmouse/CMakeLists.txt | 5 +++ examples/osgGLUTsimple/CMakeLists.txt | 5 +++ examples/osgsimpleviewerGLUT/CMakeLists.txt | 5 +++ examples/osgsimpleviewerSDL/CMakeLists.txt | 7 +++++ 5 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 examples/osgGLUTkeyboardmouse/CMakeLists.txt create mode 100644 examples/osgGLUTsimple/CMakeLists.txt create mode 100644 examples/osgsimpleviewerGLUT/CMakeLists.txt create mode 100644 examples/osgsimpleviewerSDL/CMakeLists.txt diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 4abaa4a08..1ef3c8182 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -21,9 +21,7 @@ ADD_SUBDIRECTORY(osgblendequation) ADD_SUBDIRECTORY(osgcallback) ADD_SUBDIRECTORY(osgcamera) ADD_SUBDIRECTORY(osgcatch) -#ADD_SUBDIRECTORY(osgcegui) ADD_SUBDIRECTORY(osgclip) -#to add subject to find socket#ADD_SUBDIRECTORY(osgcluster) ADD_SUBDIRECTORY(osgcopy) ADD_SUBDIRECTORY(osgcubemap) ADD_SUBDIRECTORY(osgdelaunay) @@ -35,18 +33,10 @@ ADD_SUBDIRECTORY(osgforest) ADD_SUBDIRECTORY(osgfxbrowser) ADD_SUBDIRECTORY(osggeodemo) ADD_SUBDIRECTORY(osggeometry) -#to add subject to find Glut -#ADD_SUBDIRECTORY(osgGLUTkeyboardmouse) -#ADD_SUBDIRECTORY(osgGLUTsimple) ADD_SUBDIRECTORY(osghangglide) ADD_SUBDIRECTORY(osghud) ADD_SUBDIRECTORY(osgimpostor) ADD_SUBDIRECTORY(osgintersection) - -IF (BUILD_OSG_WRAPPERS) - ADD_SUBDIRECTORY(osgintrospection) -ENDIF(BUILD_OSG_WRAPPERS) - ADD_SUBDIRECTORY(osgkeyboard) ADD_SUBDIRECTORY(osgkeyboardmouse) ADD_SUBDIRECTORY(osglauncher) @@ -82,12 +72,6 @@ ADD_SUBDIRECTORY(osgshadowtexture) ADD_SUBDIRECTORY(osgshadow) ADD_SUBDIRECTORY(osgshape) ADD_SUBDIRECTORY(osgsimple) -################################################## -#ADD_SUBDIRECTORY(osgsimpleviewerXXX) -# -#need to find dependency on windowing libraries -# -################################################## ADD_SUBDIRECTORY(osgsimplifier) ADD_SUBDIRECTORY(osgsimulation) ADD_SUBDIRECTORY(osgterrain) @@ -108,3 +92,19 @@ ADD_SUBDIRECTORY(osgvertexprogram) ADD_SUBDIRECTORY(osgvolume) ADD_SUBDIRECTORY(osgwindows) +IF (BUILD_OSG_WRAPPERS) + ADD_SUBDIRECTORY(osgintrospection) +ENDIF(BUILD_OSG_WRAPPERS) + +IF (GLUT_FOUND) + ADD_SUBDIRECTORY(osgGLUTkeyboardmouse) + ADD_SUBDIRECTORY(osgGLUTsimple) + ADD_SUBDIRECTORY(osgsimpleviewerGLUT) +ENDIF(GLUT_FOUND) + +IF (SDL_FOUND) + ADD_SUBDIRECTORY(osgsimpleviewerSDL) +ENDIF(SDL_FOUND) + +#ADD_SUBDIRECTORY(osgcegui) +#to add subject to find socket#ADD_SUBDIRECTORY(osgcluster) diff --git a/examples/osgGLUTkeyboardmouse/CMakeLists.txt b/examples/osgGLUTkeyboardmouse/CMakeLists.txt new file mode 100644 index 000000000..158327263 --- /dev/null +++ b/examples/osgGLUTkeyboardmouse/CMakeLists.txt @@ -0,0 +1,5 @@ +SET(TARGET_SRC osgGLUTkeyboardmouse.cpp ) +SET(TARGET_ADDED_LIBRARIES ${GLUT_glut_LIBRARY} ) + +#### end var setup ### +SETUP_EXAMPLE(osgGLUTkeyboardmouse) diff --git a/examples/osgGLUTsimple/CMakeLists.txt b/examples/osgGLUTsimple/CMakeLists.txt new file mode 100644 index 000000000..33a57bc0d --- /dev/null +++ b/examples/osgGLUTsimple/CMakeLists.txt @@ -0,0 +1,5 @@ +SET(TARGET_SRC osgGLUTsimple.cpp ) +SET(TARGET_ADDED_LIBRARIES ${GLUT_glut_LIBRARY} ) + +#### end var setup ### +SETUP_EXAMPLE(osgGLUTsimple) diff --git a/examples/osgsimpleviewerGLUT/CMakeLists.txt b/examples/osgsimpleviewerGLUT/CMakeLists.txt new file mode 100644 index 000000000..805ee9e5f --- /dev/null +++ b/examples/osgsimpleviewerGLUT/CMakeLists.txt @@ -0,0 +1,5 @@ +SET(TARGET_SRC osgsimpleviewerGLUT.cpp ) +SET(TARGET_ADDED_LIBRARIES ${GLUT_glut_LIBRARY} ) + +#### end var setup ### +SETUP_EXAMPLE(osgsimpleviewerGLUT) diff --git a/examples/osgsimpleviewerSDL/CMakeLists.txt b/examples/osgsimpleviewerSDL/CMakeLists.txt new file mode 100644 index 000000000..ae2c2c43b --- /dev/null +++ b/examples/osgsimpleviewerSDL/CMakeLists.txt @@ -0,0 +1,7 @@ +SET(TARGET_SRC osgsimpleviewerSDL.cpp ) +SET(TARGET_ADDED_LIBRARIES ${SDL_LIBRARY} ) + +INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} ) + +#### end var setup ### +SETUP_EXAMPLE(osgsimpleviewerSDL)