瀏覽代碼

Merge branch '0.9.1' into 0.9.2

Christophe Riccio 15 年之前
父節點
當前提交
d7716e337f
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      CMakeLists.txt

+ 3 - 3
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)
@@ -27,4 +27,4 @@ if(NOT GLM_TEST_MODE)
 	message(FATAL_ERROR "GLM is a header only library, no need to build it. Set the option GLM_TEST_MODE with ON to build and run the test bench")
 endif()
 
-install( DIRECTORY glm DESTINATION include )
+install(DIRECTORY glm DESTINATION include)