From 3530275eb5f405795206334001cf71457620fcd1 Mon Sep 17 00:00:00 2001
From: James Goppert <jgoppert@w7.hsl.dynalias.com>
Date: Mon, 21 Feb 2011 00:55:03 -0500
Subject: [PATCH] Fixed resource problem with cmake.

---
 CMakeLists.txt                | 6 ++++--
 CMakeModules/FindPhonon.cmake | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08e6dafaa..dec3f948c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,7 @@ set(CMAKE_LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
 
 # only find static libraries
 if(STATIC_LINKING)
-    message(WARNING "static linking is not yet fully functional and will have linking errors")
+    message(WARNING "static linking is not yet tested and may have linking errors")
     if(WIN32)
         set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
     else(WIN32)
@@ -186,7 +186,6 @@ if (PHONON_FOUND)
 else()
     message(STATUS "\t\tPHONON\t\tNO")
 endif (PHONON_FOUND)
-message(${PHONON_INCLUDE_DIR})
 message(STATUS "=======================================")
 
 # project flags
@@ -520,6 +519,9 @@ set (qgroundcontrolSrc
     src/ui/watchdog/WatchdogView.cc
     )
 
+# qgroundcontrol resource files
+set(qgroundcontrolRscSrc mavground.qrc)
+
 # qgroundcontrol linking
 qt4_wrap_cpp(qgroundcontrolMoc ${qgroundcontrolMocSrc})
 qt4_wrap_ui(qgroundcontrolUi ${qgroundcontrolUiSrc})
diff --git a/CMakeModules/FindPhonon.cmake b/CMakeModules/FindPhonon.cmake
index 28969c718..a89940488 100644
--- a/CMakeModules/FindPhonon.cmake
+++ b/CMakeModules/FindPhonon.cmake
@@ -31,11 +31,11 @@ else(PHONON_FOUND)
    endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
 
    # As discussed on kde-buildsystem: first look at CMAKE_PREFIX_PATH, then at the suggested PATHS (kde4 install dir)
-   find_library(PHONON_LIBRARY NAMES phonon phonon4 PATHS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
+   find_library(PHONON_LIBRARY NAMES phonon phonon4 PATHS /usr/lib ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
    # then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.)
    find_library(PHONON_LIBRARY NAMES phonon phonon4)
 
-   find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
+   find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS /usr/include ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR})
    find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h)
 
    if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
-- 
2.22.0