Merge branch '0.9.6' of https://github.com/g-truc/glm into 0.9.6

ago%!(EXTRA string=11 years) · 3c562d534f
parent ea87e50c59 2e90c3e117
commit 3c562d534f
1 changed files with 3 additions and 0 deletions
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@ -211,6 +211,9 @@

 // CUDA
 #elif defined(__CUDACC__)
+#	if !defined(CUDA_VERSION) && !defined(GLM_FORCE_CUDA)
+#		include <cuda.h>  // make sure version is defined since nvcc does not define it itself! 
+#	endif
 #	if CUDA_VERSION < 3000
 #		error "GLM requires CUDA 3.0 or higher"
 #	else