Merge pull request #1186 from Finomnis/master

Fixed FindOpenCL to find current AMD APP SDK
STEllAR-GROUP · Jul 9, 2014 · 8600c0e · 8600c0e
2 parents 40daa3e + 5e00b16
commit 8600c0e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cmake/FindOpenCL.cmake b/cmake/FindOpenCL.cmake
@@ -28,9 +28,9 @@ ELSE (APPLE)
     # The AMD SDK currently installs both x86 and x86_64 libraries
     # This is only a hack to find out architecture
     IF( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64" )
-      SET(OPENCL_LIB_DIR "$ENV{ATISTREAMSDKROOT}/lib/x86_64")
+      SET(OPENCL_LIB_DIR "$ENV{AMDAPPSDKROOT}/lib/x86_64")
     ELSE (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
-      SET(OPENCL_LIB_DIR "$ENV{ATISTREAMSDKROOT}/lib/x86")
+      SET(OPENCL_LIB_DIR "$ENV{AMDAPPSDKROOT}/lib/x86")
     ENDIF( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64" )
     FIND_LIBRARY(OPENCL_LIBRARIES OpenCL.lib PATHS "${OPENCL_LIB_DIR}" ENV OpenCL_LIBPATH)
     GET_FILENAME_COMPONENT(_OPENCL_INC_CAND "${OPENCL_LIB_DIR}/../../include" ABSOLUTE)