Skip to content

Commit

Permalink
[opencl] Uppercase CMake
Browse files Browse the repository at this point in the history
  • Loading branch information
elpaso committed Aug 8, 2018
1 parent c42a748 commit 966c3db
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,19 @@ MESSAGE(STATUS "QGIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS_VERSIO
#############################################################
# Configure OpenCL if available

option(USE_OPENCL "Use OpenCL" ON)
if (USE_OPENCL)
OPTION(USE_OPENCL "Use OpenCL" ON)
IF (USE_OPENCL)
FIND_PACKAGE(OpenCL)
<<<<<<< c42a748afc413e235254d2a94dc8af75d2109822
if(${OpenCL_FOUND})
<<<<<<< a1a09d75e627b0f085c5a1177db5d58374ca6f44
=======
IF(${OpenCL_FOUND})
>>>>>>> [opencl] Uppercase CMake
SET(HAVE_OPENCL TRUE)
else(${OpenCL_FOUND})
ELSE(${OpenCL_FOUND})
MESSAGE(STATUS "Couldn't find OpenCL: support DISABLED")
<<<<<<< c42a748afc413e235254d2a94dc8af75d2109822
=======
SET (USE_OPENCL TRUE CACHE BOOL "Use OpenCL")
IF(USE_OPENCL)
Expand All @@ -51,6 +56,10 @@ if (USE_OPENCL)
>>>>>>> [opencl] Error message when OpenCL could not be found
endif(${OpenCL_FOUND})
endif(USE_OPENCL)
=======
ENDIF(${OpenCL_FOUND})
ENDIF(USE_OPENCL)
>>>>>>> [opencl] Uppercase CMake

# Configure CCache if available
IF(NOT MSVC)
Expand Down

0 comments on commit 966c3db

Please sign in to comment.