From bedc894064f4bc8bd4eccce836b73d80ab60c68a Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 26 Sep 2014 17:53:18 +0200
Subject: [PATCH] Removing Jenkins warnings

---
 ext/ghoul                                                       | 2 +-
 include/openspace/flare/Raycaster.h                             | 2 +-
 include/openspace/interaction/externalcontrol/externalcontrol.h | 2 +-
 include/openspace/util/camera.h                                 | 2 +-
 include/openspace/util/powerscaledcoordinate.h                  | 2 +-
 include/openspace/util/powerscaledscalar.h                      | 2 +-
 src/properties/vectorproperty.cpp                               | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 08152443a9..75157a1ad1 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 08152443a9808cf84cf217e252b80d93089ee9b4
+Subproject commit 75157a1ad17e4eac992886508e4227ca64c3a229
diff --git a/include/openspace/flare/Raycaster.h b/include/openspace/flare/Raycaster.h
index 772a3fbfe6..cb2aa3002a 100644
--- a/include/openspace/flare/Raycaster.h
+++ b/include/openspace/flare/Raycaster.h
@@ -12,7 +12,7 @@ TODO: Iteratively break away parts from it into other classes.
 #include <map>
 #include <string>
 #include <vector>
-#include <glm/glm.hpp>
+#include <ghoul/glm.h>
 #include <ghoul/opencl/ghoul_cl.h>
 #include <openspace/flare/KernelConstants.h>
 //#include <boost/timer/timer.hpp>
diff --git a/include/openspace/interaction/externalcontrol/externalcontrol.h b/include/openspace/interaction/externalcontrol/externalcontrol.h
index b267880d9d..4e36ed9ce5 100644
--- a/include/openspace/interaction/externalcontrol/externalcontrol.h
+++ b/include/openspace/interaction/externalcontrol/externalcontrol.h
@@ -2,7 +2,7 @@
 #define EXTERNALCONTROL_H
 
 #include <openspace/util/powerscaledscalar.h>
-#include <glm/glm.hpp>
+#include <ghoul/glm.h>
 #include <glm/gtc/quaternion.hpp>
 
 namespace openspace {
diff --git a/include/openspace/util/camera.h b/include/openspace/util/camera.h
index 6cf32d4851..ae4abef16b 100644
--- a/include/openspace/util/camera.h
+++ b/include/openspace/util/camera.h
@@ -29,7 +29,7 @@
 #include <openspace/util/powerscaledcoordinate.h>
 
 // glm includes
-#include <glm/glm.hpp>
+#include <ghoul/glm.h>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/gtc/quaternion.hpp>
diff --git a/include/openspace/util/powerscaledcoordinate.h b/include/openspace/util/powerscaledcoordinate.h
index 2feeda11ef..48b6d6a39f 100644
--- a/include/openspace/util/powerscaledcoordinate.h
+++ b/include/openspace/util/powerscaledcoordinate.h
@@ -27,7 +27,7 @@
 
 // open space includes
 // glm includes
-#include <glm/glm.hpp>
+#include <ghoul/glm.h>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
 #include <iostream>
diff --git a/include/openspace/util/powerscaledscalar.h b/include/openspace/util/powerscaledscalar.h
index b5ae52e575..21b7aba32a 100644
--- a/include/openspace/util/powerscaledscalar.h
+++ b/include/openspace/util/powerscaledscalar.h
@@ -26,7 +26,7 @@
 #define __POWERSCALEDSCALAR_H__
 
 // glm includes
-#include <glm/glm.hpp>
+#include <ghoul/glm.h>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
diff --git a/src/properties/vectorproperty.cpp b/src/properties/vectorproperty.cpp
index f05299cb37..288dd6ce2a 100644
--- a/src/properties/vectorproperty.cpp
+++ b/src/properties/vectorproperty.cpp
@@ -26,7 +26,7 @@
 
 #include <ghoul/lua/ghoul_lua.h>
 
-#include <glm/glm.hpp>
+#include <ghoul/glm.h>
 
 #include <limits>