From e729867fa1a0de08ccaa6ee8ca2885cf78d01c33 Mon Sep 17 00:00:00 2001
From: James Goppert <jgoppert@w7.hsl.dynalias.com>
Date: Mon, 28 Feb 2011 02:51:45 -0500
Subject: [PATCH] Cmake bug fix.

---
 CMakeLists.txt | 47 +++++++++++++++++++----------------------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4d216e3c..788428750 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,8 +123,13 @@ if (UNIX)
     find_package(Flite)
 endif(UNIX)
 find_package(OpenGL REQUIRED)
-set(OpenSceneGraph_FIND_QUIETLY FALSE)
 find_package(OpenSceneGraph 2.9.9 COMPONENTS osgGA osgDB osgUtil osgViewer)
+if ("OSG_LIBRARY" STREQUAL "${OSG_LIBRARY}")
+    set(OPENSCENEGRAPH_FOUND FALSE)
+else()
+    set(OPENSCENEGRAPH_FOUND TRUE)
+endif()
+
 find_or_build_from_source(MAVLINK thirdParty/mavlink FOUND_GIT_REPO)
 
 # build libraries from source if not found on system
@@ -191,63 +196,49 @@ message(STATUS "\tDEPENDENCY\t\tFOUND")
 message(STATUS "=======================================")
 
 # common dependencies
+message(STATUS "\t\tMAVLINK\t\t${MAVLINK_FOUND}")
 if (MAVLINK_FOUND)
-    message(STATUS "\t\tMAVLINK\t\tYES")
     list(APPEND qgroundcontrolIncludes ${MAVLINK_INCLUDE_DIRS})
-else()
-    message(STATUS "\t\tMAVLINK\tNO")
-endif ()
+endif()
 
+message(STATUS "\t\tOpenSceneGraph\t${OPENSCENEGRAPH_FOUND}")
 if (OPENSCENEGRAPH_FOUND)
-    message(STATUS "\t\tOpenSceneGraph\tNO")
-else()
-    message(STATUS "\t\tOpenSceneGraph\tYES")
     list(APPEND qgroundcontrolIncludes ${OPENSCENEGRAPH_INCLUDE_DIRS})
     list(APPEND qgroundcontrolLibs ${OPENSCENEGRAPH_LIBRARIES})
-endif ()
+endif()
 
+message(STATUS "\t\tQT4\t\t${QT4_FOUND}")
 if (QT4_FOUND)
-    message(STATUS "\t\tQT4\t\tYES")
     list(APPEND qgroundcontrolIncludes ${QT_INCLUDE_DIRS})
     list(APPEND qgroundcontrolLibs ${QT_LIBRARIES})
-else()
-    message(STATUS "\t\tQT4\t\tNO")
-endif ()
+endif()
 
+message(STATUS "\t\tPHONON\t\t${PHONON_FOUND}")
 if (PHONON_FOUND)
-    message(STATUS "\t\tPHONON\t\tYES")
     list(APPEND qgroundcontrolIncludes ${PHONON_INCLUDES})
     list(APPEND qgroundcontrolLibs ${PHONON_LIBS})
-else()
-    message(STATUS "\t\tPHONON\t\tNO")
-endif ()
+endif()
 
+message(STATUS "\t\tSDL\t\t${SDL_FOUND}")
 if (SDL_FOUND)
-    message(STATUS "\t\tSDL\t\tYES")
     list(APPEND qgroundcontrolIncludes ${SDL_INCLUDE_DIR})
     list(APPEND qgroundcontrolLibs ${SDL_LIBRARY})
-else()
-    message(STATUS "\t\tSDL\t\tNO")
-endif ()
+endif()
 
+message(STATUS "\t\tOPENGL\t\t${OPENGL_FOUND}")
 if (OPENGL_FOUND)
-    message(STATUS "\t\tOPENGL\t\tYES")
     list(APPEND qgroundcontrolIncludes ${OPENGL_INCLUDE_DIR})
     list(APPEND qgroundcontrolLibs ${OPENGL_LIBRARIES})
-else()
-    message(STATUS "\t\tOPENGL\t\tNO")
 endif()
 
 # unix only dependencies
 if (UNIX)
+    message(STATUS "\t\tFLITE\t\t${FLITE_FOUND}")
     if (FLITE_FOUND)
-        message(STATUS "\t\tFLITE\t\tYES")
         list(APPEND qgroundcontrolIncludes ${FLITE_INCLUDE_DIR})
         list(APPEND qgroundcontrolLibs ${FLITE_LIBRARIES})
-    else()
-        message(STATUS "\t\tFLITE\t\tNO")
     endif ()
-endif(UNIX)
+endif()
 
 # set include directories
 include_directories(${qgroundcontrolIncludes})
-- 
2.22.0