move GLMTestUtils.h where all tests can find it

This commit is contained in:
Andrew Meadows 2015-08-12 13:51:40 -07:00
parent ba5346aee7
commit cae77cfd76
5 changed files with 5 additions and 4 deletions

View file

@ -12,7 +12,7 @@ foreach(DIR ${TEST_SUBDIRS})
endif() endif()
endforeach() endforeach()
file(GLOB SHARED_TEST_HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp") file(GLOB SHARED_TEST_HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.h " "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
add_custom_target("test-extensions" add_custom_target("test-extensions"
SOURCES "${SHARED_TEST_HEADER_FILES}") SOURCES "${SHARED_TEST_HEADER_FILES}")

View file

@ -20,6 +20,7 @@
inline float getErrorDifference(const glm::vec3& a, const glm::vec3& b) { inline float getErrorDifference(const glm::vec3& a, const glm::vec3& b) {
return glm::distance(a, b); return glm::distance(a, b);
} }
inline QTextStream& operator<<(QTextStream& stream, const glm::vec3& v) { inline QTextStream& operator<<(QTextStream& stream, const glm::vec3& v) {
return stream << "glm::vec3 { " << v.x << ", " << v.y << ", " << v.z << " }"; return stream << "glm::vec3 { " << v.x << ", " << v.y << ", " << v.z << " }";
} }

View file

@ -15,6 +15,8 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <functional> #include <functional>
#include "GLMTestUtils.h"
// Implements several extensions to QtTest. // Implements several extensions to QtTest.
// //
// Problems with QtTest: // Problems with QtTest:

View file

@ -17,7 +17,6 @@
#include <NumericalConstants.h> #include <NumericalConstants.h>
// Add additional qtest functionality (the include order is important!) // Add additional qtest functionality (the include order is important!)
#include "GLMTestUtils.h"
#include "../QTestExtensions.h" #include "../QTestExtensions.h"
// Constants // Constants

View file

@ -16,7 +16,6 @@
// Add additional qtest functionality (the include order is important!) // Add additional qtest functionality (the include order is important!)
#include "BulletTestUtils.h" #include "BulletTestUtils.h"
#include "GLMTestUtils.h"
#include "../QTestExtensions.h" #include "../QTestExtensions.h"
const btScalar acceptableRelativeError(1.0e-5f); const btScalar acceptableRelativeError(1.0e-5f);