Commit a8e49a56 authored by Robert Menzel's avatar Robert Menzel

adjusted to the new GLM 0.9.3 -> no ignoring of the warnings needed anymore

parent 3ec67a44
cmake @ 15115c56
Subproject commit f93d27f5a7420ec6b3c1974eeb6e30bc9b97801d
Subproject commit 15115c56e314569265d0ca4bba3fad1993c2777f
......@@ -18,13 +18,6 @@
#include <cmath>
#include <limits>
/*
* Swizzling has to be defined before the glm.hpp gets first included, no not forget
* this, you should never include glm yourself, but include always our ACGL/Math.hh!
*/
#define GLM_SWIZZL
#include <glm/glm.hpp>
namespace ACGL{
namespace Math{
namespace Functions{
......
......@@ -16,41 +16,11 @@
*
* Swizzling has to be defined before the glm.hpp gets first included, no not forget
* this, you should never include glm yourself, but include always our ACGL/Math.hh!
*
* Pragmas: try to ignore warnings in GLM, so warnings can be activated for ACGL builds
* and the log does not get flooded with GLM warnings that we can't fix anyway with the
* risk of not seeing ACGL warnings.
*/
#if (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || (__GNUC__ > 4))
#define COMPILER_IS_GCC_4_6_OR_NEWER
#endif
#ifdef __clang__
// clang/llvm:
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wuninitialized"
# pragma clang diagnostic ignored "-Wunused-parameter"
#elif defined __GNUC__
# ifdef COMPILER_IS_GCC_4_6_OR_NEWER
// gcc >= 4.6:
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wtype-limits"
# endif
// gcc:
# pragma GCC diagnostic ignored "-Wunused-parameter"
#endif
#include <glm/glm.hpp>
#include <glm/ext.hpp>
#ifdef __clang__
// clang/llvm:
# pragma clang diagnostic pop
#elif defined COMPILER_IS_GCC_4_6_OR_NEWER
// gcc >= 4.6:
# pragma GCC diagnostic pop
#endif
#include <ACGL/Math/Constants.hh>
#include <ACGL/Math/Functions.hh>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment