Removing Jenkins warnings

2026-01-08 20:50:19 -06:00 · 2014-09-26 17:53:18 +02:00
parent 742b1016d4
commit bedc894064
7 changed files with 7 additions and 7 deletions
--- a/ext/ghoul
+++ b/ext/ghoul
--- 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>
--- 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 {
--- 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>
--- 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>
--- 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>

--- 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>