From 437d5c7bdf57febff22cd039c5102c8e5fdbde69 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 23 Feb 2015 09:26:35 -0800
Subject: [PATCH] repairs to include locations for QXmpp and SDL2

---
 cmake/externals/sdl2/CMakeLists.txt                        | 4 +++-
 cmake/modules/FindQxmpp.cmake                              | 2 +-
 interface/src/XmppClient.h                                 | 4 ++--
 interface/src/scripting/GlobalServicesScriptingInterface.h | 4 ++--
 interface/src/ui/ChatWindow.h                              | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cmake/externals/sdl2/CMakeLists.txt b/cmake/externals/sdl2/CMakeLists.txt
index 00936a8320..5b60e60af1 100644
--- a/cmake/externals/sdl2/CMakeLists.txt
+++ b/cmake/externals/sdl2/CMakeLists.txt
@@ -33,6 +33,7 @@ string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 if (WIN32)
   ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
   set(_ROOT_DIR ${SOURCE_DIR})
+  set(_INCLUDE_DIR ${_ROOT_DIR}/include)
   set(_LIB_DIR "${SOURCE_DIR}/lib/x86")
   set(_LIB_EXT "lib")
   
@@ -40,11 +41,12 @@ if (WIN32)
 else ()
   ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
   set(_ROOT_DIR ${INSTALL_DIR})
+  set(_INCLUDE_DIR ${_ROOT_DIR}/include/SDL2)
   
   set(_LIB_DIR ${INSTALL_DIR}/lib)
   set(_LIB_EXT "so")
   set(_LIB_PREFIX "lib")
 endif ()
 
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${_ROOT_DIR}/include/SDL2 CACHE PATH "Location of SDL2 include directory")
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${_INCLUDE_DIR} CACHE PATH "Location of SDL2 include directory")
 set(${EXTERNAL_NAME_UPPER}_LIBRARY_TEMP ${_LIB_DIR}/${_LIB_PREFIX}SDL2.${_LIB_EXT} CACHE FILEPATH "Path to SDL2 library")
\ No newline at end of file
diff --git a/cmake/modules/FindQxmpp.cmake b/cmake/modules/FindQxmpp.cmake
index 7c1579835d..489936688e 100644
--- a/cmake/modules/FindQxmpp.cmake
+++ b/cmake/modules/FindQxmpp.cmake
@@ -21,7 +21,7 @@
 include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
 hifi_library_search_hints("qxmpp")
 
-find_path(QXMPP_INCLUDE_DIRS QXmppClient.h PATH_SUFFIXES include/qxmpp HINTS ${QXMPP_SEARCH_DIRS})
+find_path(QXMPP_INCLUDE_DIRS qxmpp/QXmppClient.h PATH_SUFFIXES include HINTS ${QXMPP_SEARCH_DIRS})
 
 find_library(QXMPP_LIBRARY_RELEASE NAMES qxmpp PATH_SUFFIXES lib HINTS ${QXMPP_SEARCH_DIRS})
 find_library(QXMPP_LIBRARY_DEBUG NAMES qxmpp_d PATH_SUFFIXES lib HINTS ${QXMPP_SEARCH_DIRS})
diff --git a/interface/src/XmppClient.h b/interface/src/XmppClient.h
index 91c10c4055..2b7a831ff3 100644
--- a/interface/src/XmppClient.h
+++ b/interface/src/XmppClient.h
@@ -15,8 +15,8 @@
 #include <QObject>
 
 #ifdef HAVE_QXMPP
-#include <QXmppClient.h>
-#include <QXmppMucManager.h>
+#include <qxmpp/QXmppClient.h>
+#include <qxmpp/QXmppMucManager.h>
 #endif
 
 /// Generalized threaded processor for handling received inbound packets. 
diff --git a/interface/src/scripting/GlobalServicesScriptingInterface.h b/interface/src/scripting/GlobalServicesScriptingInterface.h
index 657cb945c5..d8b436a6e6 100644
--- a/interface/src/scripting/GlobalServicesScriptingInterface.h
+++ b/interface/src/scripting/GlobalServicesScriptingInterface.h
@@ -21,8 +21,8 @@
 
 #ifdef HAVE_QXMPP
 
-#include <QXmppClient.h>
-#include <QXmppMessage.h>
+#include <qxmpp/QXmppClient.h>
+#include <qxmpp/QXmppMessage.h>
 
 #endif // HAVE_QXMPP
 
diff --git a/interface/src/ui/ChatWindow.h b/interface/src/ui/ChatWindow.h
index 2338ab280d..b2ee113637 100644
--- a/interface/src/ui/ChatWindow.h
+++ b/interface/src/ui/ChatWindow.h
@@ -25,8 +25,8 @@
 
 #ifdef HAVE_QXMPP
 
-#include <QXmppClient.h>
-#include <QXmppMessage.h>
+#include <qxmpp/QXmppClient.h>
+#include <qxmpp/QXmppMessage.h>
 
 #endif