From 5c5e343a6cffb17942597d24628a11aab0fddf2a Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 9 May 2011 00:26:30 +0100 Subject: [PATCH] Automatically detect GLM --- glm/core/setup.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index a90095fb..506d8767 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -169,7 +169,7 @@ # define GLM_COMPILER GLM_COMPILER_CODEWARRIOR // CUDA -#elif defined(CUDA_VERSION) +#elif defined(__CUDACC__) # if CUDA_VERSION < 3000 # error "GLM requires CUDA 3.0 or higher" # elif CUDA_VERSION == 3000 @@ -180,6 +180,8 @@ # define GLM_COMPILER GLM_COMPILER_CUDA32 # elif CUDA_VERSION == 4000 # define GLM_COMPILER GLM_COMPILER_CUDA40 +# else +# define GLM_COMPILER GLM_COMPILER_CUDA # endif #else