fix build errors for shared-tests

This commit is contained in:
Andrew Meadows 2015-07-28 12:05:45 -07:00
parent 6e41a79551
commit 2aa453b610
6 changed files with 7 additions and 9 deletions

View file

@ -16,6 +16,7 @@
#include <StreamUtils.h> #include <StreamUtils.h>
#include "AngularConstraintTests.h" #include "AngularConstraintTests.h"
#include "../QTestExtensions.h"
// Computes the error value between two quaternions (using glm::dot) // Computes the error value between two quaternions (using glm::dot)
float getErrorDifference(const glm::quat& a, const glm::quat& b) { float getErrorDifference(const glm::quat& a, const glm::quat& b) {

View file

@ -12,6 +12,7 @@
#ifndef hifi_AngularConstraintTests_h #ifndef hifi_AngularConstraintTests_h
#define hifi_AngularConstraintTests_h #define hifi_AngularConstraintTests_h
#include <glm/glm.hpp>
#include <QtTest/QtTest> #include <QtTest/QtTest>
class AngularConstraintTests : public QObject { class AngularConstraintTests : public QObject {
@ -21,10 +22,6 @@ private slots:
void testConeRollerConstraint(); void testConeRollerConstraint();
}; };
// Use QCOMPARE_WITH_ABS_ERROR and define it for glm::quat float getErrorDifference(const glm::quat& a, const glm::quat& b);
#include <glm/glm.hpp>
float getErrorDifference (const glm::quat& a, const glm::quat& b);
QTextStream & operator << (QTextStream& stream, const glm::quat& q);
#include "../QTestExtensions.h"
#endif // hifi_AngularConstraintTests_h #endif // hifi_AngularConstraintTests_h

View file

@ -16,6 +16,7 @@
#include <limits> #include <limits>
#include <qqueue.h> #include <qqueue.h>
#include <../QTestExtensions.h>
QTEST_MAIN(MovingPercentileTests) QTEST_MAIN(MovingPercentileTests)

View file

@ -13,7 +13,6 @@
#define hifi_MovingPercentileTests_h #define hifi_MovingPercentileTests_h
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <../QTestExtensions.h>
class MovingPercentileTests : public QObject { class MovingPercentileTests : public QObject {
Q_OBJECT Q_OBJECT

View file

@ -8,10 +8,12 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#include "TransformTests.h"
#include <Transform.h> #include <Transform.h>
#include "TransformTests.h"
#include "SharedLogging.h" #include "SharedLogging.h"
#include <../QTestExtensions.h>
using namespace glm; using namespace glm;

View file

@ -40,8 +40,6 @@ inline QTextStream& operator<< (QTextStream& stream, const glm::mat4& matrix) {
return stream; return stream;
} }
#include <../QTestExtensions.h>
class TransformTests : public QObject { class TransformTests : public QObject {
Q_OBJECT Q_OBJECT
private slots: private slots: