Fixed problems finding OpenCL location

CMakeLists.txt

@@ -347,8 +347,6 @@ ENDIF(OPENCL_FOUND AND APPLE)
 IF(OPENMM_BUILD_OPENCL_LIB)
     ADD_SUBDIRECTORY(platforms/opencl)
 ENDIF(OPENMM_BUILD_OPENCL_LIB)
-MARK_AS_ADVANCED(CLEAR OPENCL_INCLUDE_DIR)
-MARK_AS_ADVANCED(CLEAR OPENCL_LIBRARY)
 
 # FreeEnergy plugin
 

platforms/opencl/FindOpenCL.cmake

+MARK_AS_ADVANCED(CLEAR OPENCL_INCLUDE_DIR)
+MARK_AS_ADVANCED(CLEAR OPENCL_LIBRARY)
 set(ENV_OPENCL_DIR $ENV{OPENCL_DIR})
 if(ENV_OPENCL_DIR)
   find_path(OPENCL_INCLUDE_DIR NAMES CL/cl.h PATHS $ENV{OPENCL_DIR}/include NO_DEFAULT_PATH)
@@ -11,7 +13,11 @@ if(ENV_OPENCL_DIR)
   endif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
   find_library(OPENCL_LIBRARY NAMES OpenCL PATHS ${OPENCL_LIB_SEARCH_PATH} NO_DEFAULT_PATH)
 else(ENV_OPENCL_DIR)
-  find_path(OPENCL_INCLUDE_DIR NAMES CL/cl.h)
+  if (APPLE)
+    find_path(OPENCL_INCLUDE_DIR NAMES OpenCL/cl.h)
+  else (APPLE)
+    find_path(OPENCL_INCLUDE_DIR NAMES CL/cl.h)
+  endif(APPLE)
   find_library(OPENCL_LIBRARY NAMES OpenCL)
 endif(ENV_OPENCL_DIR)
 
@@ -23,5 +29,3 @@ if(OPENCL_FOUND)
 else(OPENCL_FOUND)
   set(OPENCL_LIBRARIES)
 endif(OPENCL_FOUND)
-
-mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
\ No newline at end of file