pull glm 0.9.6

CMakeLists.txt

@@ -13,11 +13,6 @@ if(NOT GLM_TEST_ENABLE)
 	message(STATUS "GLM is a header only library, no need to build it. Set the option GLM_TEST_ENABLE with ON to build and run the test bench")
 endif()
 
-option(GLM_PERF_ENABLE "GLM perf" OFF)
-if(GLM_PERF_ENABLE)
-	add_definitions(-DGLM_TEST_ENABLE_PERF)
-endif()
-
 if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") OR (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") AND UNIX))
 	option(GLM_TEST_ENABLE_CXX_98 "Enable C++ 98" OFF)
 	option(GLM_TEST_ENABLE_CXX_0X "Enable C++ 0x" OFF)
@@ -72,38 +67,38 @@ if(GLM_TEST_FORCE_PURE)
 	elseif(MSVC)
 		add_definitions(/arch:IA32)
 	endif()
-elseif(GLM_TEST_ENABLE_AVX2)
+elseif(GLM_TEST_ENABLE_SIMD_AVX2)
 	if(CMAKE_COMPILER_IS_GNUCXX)
 		add_definitions(-mavx2)
 	elseif(GLM_USE_INTEL)
 		add_definitions(/QxAVX2)
 	elseif(MSVC)
-		add_definitions(/arch:AVX2)	
+		add_definitions(/arch:AVX2)
 	endif()
-elseif(GLM_TEST_ENABLE_AVX)
+elseif(GLM_TEST_ENABLE_SIMD_AVX)
 	if(CMAKE_COMPILER_IS_GNUCXX)
 		add_definitions(-mavx)
 	elseif(GLM_USE_INTEL)
 		add_definitions(/QxAVX)
 	elseif(MSVC)
-		add_definitions(/arch:AVX)	
+		add_definitions(/arch:AVX)
 	endif()
-elseif(GLM_TEST_ENABLE_SSE3)
+elseif(GLM_TEST_ENABLE_SIMD_SSE3)
 	if(CMAKE_COMPILER_IS_GNUCXX)
 		add_definitions(-msse3)
 	elseif(GLM_USE_INTEL)
 		add_definitions(/QxSSE3)
 	elseif(MSVC)
 		add_definitions(/arch:SSE2) # VC doesn't support /arch:SSE3	
 	endif()
-elseif(GLM_TEST_ENABLE_SSE2)
+elseif(GLM_TEST_ENABLE_SIMD_SSE2)
 	if(CMAKE_COMPILER_IS_GNUCXX)
 		add_definitions(-msse2)
 	elseif(GLM_USE_INTEL)
 		add_definitions(/QxSSE2)
 	elseif(MSVC)
 		if(NOT CMAKE_CL_64)
-			add_definitions(/arch:SSE2)	
+			add_definitions(/arch:SSE2)
 		endif()
 	endif()
 endif()

copying.txt

@@ -1,6 +1,39 @@
-The MIT License
+================================================================================
+OpenGL Mathematics (GLM)
+--------------------------------------------------------------------------------
+GLM is licensed under The Happy Bunny License and MIT License
+
+================================================================================
+The Happy Bunny License (Modified MIT License)
+--------------------------------------------------------------------------------
+Copyright (c) 2005 - 2014 G-Truc Creation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+Restrictions:
+ By making use of the Software for military purposes, you choose to make a
+ Bunny unhappy.
 
-Copyright (c) 2005 - 2013 G-Truc Creation
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+================================================================================
+The MIT License
+--------------------------------------------------------------------------------
+Copyright (c) 2005 - 2014 G-Truc Creation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal