Merge branch '0.9.1' into 0.9.2

ago%!(EXTRA string=15 years) · d7716e337f
parent d7dcb84b5c 5d6a6b3928
commit d7716e337f
1 changed files with 3 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
 cmake_policy(VERSION 2.6)

 project(glm)
-enable_testing()
+#Delayed for GLM 0.9.2
+#enable_testing()

 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 add_definitions(-pedantic)
@ -16,7 +17,6 @@ add_definitions(-msse2)

 include_directories(".")

-
 add_subdirectory(glm)
 add_subdirectory(test)
 add_subdirectory(bench)