diff --git a/CMake/FindOpenCL.cmake b/CMake/FindOpenCL.cmake
index e30fb7a484..d960d45acf 100644
--- a/CMake/FindOpenCL.cmake
+++ b/CMake/FindOpenCL.cmake
@@ -1,89 +1,89 @@
 # - Try to find OpenCL
 # This module tries to find an OpenCL implementation on your system. It supports
 # AMD / ATI, Apple and NVIDIA implementations, but should work, too.
 #
 # To set manually the paths, define these environment variables:
 # OpenCL_INCPATH    - Include path (e.g. OpenCL_INCPATH=/opt/cuda/4.0/cuda/include)
 # OpenCL_LIBPATH    - Library path (e.h. OpenCL_LIBPATH=/usr/lib64/nvidia)
 #
 # Once done this will define
 #  OPENCL_FOUND        - system has OpenCL
 #  OPENCL_INCLUDE_DIRS  - the OpenCL include directory
 #  OPENCL_LIBRARIES    - link these to use OpenCL
 #
 # WIN32 should work, but is untested
 
 FIND_PACKAGE(PackageHandleStandardArgs)
 
 SET (OPENCL_VERSION_STRING "0.1.0")
 SET(OPENCL_VERSION_MAJOR 0)
 SET(OPENCL_VERSION_MINOR 1)
 SET(OPENCL_VERSION_PATCH 0)
 
 IF(APPLE)
 
     FIND_LIBRARY(OPENCL_LIBRARIES OpenCL DOC "OpenCL lib for OSX")
     FIND_PATH(OPENCL_INCLUDE_DIRS OpenCL/cl.h DOC "Include for OpenCL on OSX")
     FIND_PATH(_OPENCL_CPP_INCLUDE_DIRS OpenCL/cl.hpp DOC "Include for OpenCL CPP bindings on OSX")
 
 ELSE()
     IF (WIN32)
 
         FIND_PATH(OPENCL_INCLUDE_DIRS CL/cl.h)
         FIND_PATH(_OPENCL_CPP_INCLUDE_DIRS CL/cl.hpp)
 
         IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
             SET(OPENCL_LIB_DIR "$ENV{ATISTREAMSDKROOT}/lib/x86_64")
             if(NOT IS_DIRECTORY  ${OPENCL_LIB_DIR})
                 SET(OPENCL_LIB_DIR "$ENV{CUDA_PATH}/lib/x64")
             endif()
         ELSE()
             SET(OPENCL_LIB_DIR "$ENV{ATISTREAMSDKROOT}/lib/x86")
             if(NOT IS_DIRECTORY  ${OPENCL_LIB_DIR}) # need to convert path in the cmake style ?
                 SET(OPENCL_LIB_DIR "$ENV{CUDA_PATH}/lib/Win32")
             endif()
         ENDIF()
         file(TO_CMAKE_PATH ${OPENCL_LIB_DIR} OPENCL_LIB_DIR)
         GET_FILENAME_COMPONENT(OPENCL_LIB_DIR ${OPENCL_LIB_DIR} ABSOLUTE)
 
         FIND_LIBRARY(OPENCL_LIBRARIES OpenCL.lib PATHS ${OPENCL_LIB_DIR} ENV OpenCL_LIBPATH)
 
         GET_FILENAME_COMPONENT(_OPENCL_INC_CAND ${OPENCL_LIB_DIR}/../../include ABSOLUTE)
 
         # On Win32 search relative to the library
         FIND_PATH(OPENCL_INCLUDE_DIRS CL/cl.h PATHS "${_OPENCL_INC_CAND}" ENV OpenCL_INCPATH)
         FIND_PATH(_OPENCL_CPP_INCLUDE_DIRS CL/cl.hpp PATHS "${_OPENCL_INC_CAND}" ENV OpenCL_INCPATH)
 
-    ELSE (WIN32)
+    ELSE ()
 
         # Unix style platforms
         FIND_LIBRARY(OPENCL_LIBRARIES OpenCL
             PATHS ENV LD_LIBRARY_PATH ENV OpenCL_LIBPATH
             )
 
         GET_FILENAME_COMPONENT(OPENCL_LIB_DIR ${OPENCL_LIBRARIES} PATH)
         GET_FILENAME_COMPONENT(_OPENCL_INC_CAND ${OPENCL_LIB_DIR}/../../include ABSOLUTE)
 
         # The AMD SDK currently does not place its headers
         # in /usr/include, therefore also search relative
         # to the library
         FIND_PATH(OPENCL_INCLUDE_DIRS CL/cl.h PATHS ${_OPENCL_INC_CAND} "/usr/local/cuda/include" "/opt/AMDAPP/include" ENV OpenCL_INCPATH)
         FIND_PATH(_OPENCL_CPP_INCLUDE_DIRS CL/cl.hpp PATHS ${_OPENCL_INC_CAND} "/usr/local/cuda/include" "/opt/AMDAPP/include" ENV OpenCL_INCPATH)
 
-    ENDIF (WIN32)
+    ENDIF ()
 
-ENDIF (APPLE)
+ENDIF ()
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenCL DEFAULT_MSG OPENCL_LIBRARIES OPENCL_INCLUDE_DIRS)
 
 IF(_OPENCL_CPP_INCLUDE_DIRS)
     SET( OPENCL_HAS_CPP_BINDINGS TRUE )
     LIST( APPEND OPENCL_INCLUDE_DIRS ${_OPENCL_CPP_INCLUDE_DIRS} )
     # This is often the same, so clean up
     LIST( REMOVE_DUPLICATES OPENCL_INCLUDE_DIRS )
-ENDIF(_OPENCL_CPP_INCLUDE_DIRS)
+ENDIF()
 
 MARK_AS_ADVANCED(
     OPENCL_INCLUDE_DIRS
     )