diff --git a/CMakeLists.txt b/CMakeLists.txt
index 611d70ef7..4cd1d2fba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,12 +124,12 @@ IF(MSVC)
 	FIND_PATH(AMD_OPENCL_BASE_DIR include/CL/cl.h PATH  $ENV{ATISTREAMSDKROOT} )
 	IF(AMD_OPENCL_BASE_DIR)
 		#AMD adds an extras slash at the end of the ATISTREAMSDKROOT variable
-		SET(AMD_OPENCL_INCLUDES $ENV{ATISTREAMSDKROOT}include )
+		SET(AMD_OPENCL_INCLUDES ${AMD_OPENCL_BASE_DIR}/include )
 		MESSAGE(${AMD_OPENCL_INCLUDES})
 		IF (CMAKE_CL_64)
-			SET(CMAKE_ATISTREAMSDK_LIBPATH 		$ENV{ATISTREAMSDKROOT}lib/x86_64 )
+			SET(CMAKE_ATISTREAMSDK_LIBPATH 		${AMD_OPENCL_BASE_DIR}/lib/x86_64 )
 		ELSE(CMAKE_CL_64)
-			SET(CMAKE_ATISTREAMSDK_LIBPATH		$ENV{ATISTREAMSDKROOT}lib/x86		)
+			SET(CMAKE_ATISTREAMSDK_LIBPATH		${AMD_OPENCL_BASE_DIR}/lib/x86		)
 		ENDIF(CMAKE_CL_64)
 		OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)"	ON)
 	ELSE()
@@ -138,12 +138,12 @@ IF(MSVC)
 	
 	FIND_PATH(NVIDIA_OPENCL_BASE_DIR OpenCL/common/inc/CL/cl.h PATH  $ENV{NVSDKCOMPUTE_ROOT} )
 	IF(NVIDIA_OPENCL_BASE_DIR)
-		SET(NVIDIA_OPENCL_INCLUDES $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/inc )
+		SET(NVIDIA_OPENCL_INCLUDES ${NVIDIA_OPENCL_BASE_DIR}/OpenCL/common/inc )
 		MESSAGE(${NVIDIA_OPENCL_INCLUDES})
 		IF (CMAKE_CL_64)
-			SET(CMAKE_NVSDKCOMPUTE_LIBPATH		$ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/x64 )
+			SET(CMAKE_NVSDKCOMPUTE_LIBPATH		${NVIDIA_OPENCL_BASE_DIR}/OpenCL/common/lib/x64 )
 		ELSE(CMAKE_CL_64)
-			SET(CMAKE_NVSDKCOMPUTE_LIBPATH		$ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/Win32	)
+			SET(CMAKE_NVSDKCOMPUTE_LIBPATH		${NVIDIA_OPENCL_BASE_DIR}/OpenCL/common/lib/Win32	)
 		ENDIF(CMAKE_CL_64)
 	SET(NVIDIA_OPENCL_LIBRARIES		${CMAKE_NVSDKCOMPUTE_LIBPATH}/OpenCL.lib)