Fixed build system error

This commit is contained in:
Christophe Riccio 2016-11-19 19:59:47 +01:00
parent 2608e71aac
commit a3427f7027
2 changed files with 11 additions and 5 deletions

View File

@ -2,6 +2,6 @@ before_build:
- cmake -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON . - cmake -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON .
build_script: build_script:
- cmake --build . - cmake --build .
- ctest - ctest

View File

@ -1,5 +1,7 @@
#define GLM_ENABLE_EXPERIMENTAL #define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtc/noise.hpp> #include <glm/gtc/noise.hpp>
#if GLM_LANG & GLM_LANG_CXX11_FLAG
#include <gli/gli.hpp> #include <gli/gli.hpp>
int test_simplex() int test_simplex()
@ -149,13 +151,17 @@ int test_perlin_pedioric()
return 0; return 0;
} }
#endif//GLM_LANG & GLM_LANG_CXX11_FLAG
int main() int main()
{ {
int Error = 0; int Error = 0;
Error += test_simplex(); # if GLM_LANG & GLM_LANG_CXX11_FLAG
Error += test_perlin(); Error += test_simplex();
Error += test_perlin_pedioric(); Error += test_perlin();
Error += test_perlin_pedioric();
# endif
return Error; return Error;
} }