Cleaned up set up of SDL.

CMakeLists.txt

@@ -331,6 +331,7 @@ FIND_PACKAGE(OurDCMTK)
 FIND_PACKAGE(OpenAL)
 FIND_PACKAGE(XUL)
 FIND_PACKAGE(FFmpeg)
+FIND_PACKAGE(SDL)
 
 #use pkg-config to find various modues
 INCLUDE(FindPkgConfig OPTIONAL)
@@ -353,13 +354,13 @@ IF(PKG_CONFIG_FOUND)
 
 ENDIF()
 
+
 #optional example related dependencies
 IF   (BUILD_OSG_EXAMPLES)
 
 
     FIND_PACKAGE(FLTK)
     FIND_PACKAGE(GLUT)
-    FIND_PACKAGE(SDL)
     FIND_PACKAGE(FOX)
 
     SET(wxWidgets_USE_LIBS base core gl net)

applications/present3D/CMakeLists.txt

@@ -28,12 +28,12 @@ SET(TARGET_H
 
 IF (SDL_FOUND)
 
-    OPTION(BUILD_WITH_SDL "Set to ON to build with SDL for joystick support." OFF)
+    OPTION(BUILD_PRESENT3D_WITH_SDL "Set to ON to build Present3D with SDL for joystick support." OFF)
 
-    IF (BUILD_WITH_SDL)
+    IF (BUILD_PRESENT3D_WITH_SDL)
 
-        SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} ${SDL_LIBRARY})
-        SET(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${SDL_INCLUDE_DIR})
+        SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} )
+        INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} )
 
         SET(TARGET_SRC
            ${TARGET_SRC}
@@ -47,14 +47,14 @@ IF (SDL_FOUND)
 
         ADD_DEFINITIONS(-DUSE_SDL)
 
-    ENDIF(BUILD_WITH_SDL)
+    ENDIF()
 
-ENDIF(SDL_FOUND)
+ENDIF()
 
 SET(TARGET_ADDED_LIBRARIES osgVolume osgFX)
 
 IF   (WIN32)
-   SET(TARGET_EXTERNAL_LIBRARIES ws2_32)
-ENDIF(WIN32)
+   SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32)
+ENDIF()
 
 SETUP_APPLICATION(present3D-osg)