File tree Expand file tree Collapse file tree 1 file changed +12
-3
lines changed
Expand file tree Collapse file tree 1 file changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -30,14 +30,19 @@ MESSAGE(STATUS "QGIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS_VERSIO
3030#############################################################
3131# Configure OpenCL if available
3232
33- option (USE_OPENCL "Use OpenCL" ON )
34- if (USE_OPENCL)
33+ OPTION (USE_OPENCL "Use OpenCL" ON )
34+ IF (USE_OPENCL)
3535 FIND_PACKAGE (OpenCL)
36+ <<<<<<< c42a748afc413e235254d2a94dc8af75d2109822
3637 if (${OpenCL_FOUND} )
3738<<<<<<< a1a09d75e627b0f085c5a1177db5d58374ca6f44
39+ =======
40+ IF (${OpenCL_FOUND} )
41+ >>>>>>> [opencl] Uppercase CMake
3842 SET (HAVE_OPENCL TRUE )
39- else (${OpenCL_FOUND} )
43+ ELSE (${OpenCL_FOUND} )
4044 MESSAGE (STATUS "Couldn't find OpenCL: support DISABLED" )
45+ <<<<<<< c42a748afc413e235254d2a94dc8af75d2109822
4146=======
4247 SET (USE_OPENCL TRUE CACHE BOOL "Use OpenCL" )
4348 IF (USE_OPENCL)
@@ -51,6 +56,10 @@ if (USE_OPENCL)
5156>>>>>>> [opencl] Error message when OpenCL could not be found
5257 endif (${OpenCL_FOUND} )
5358endif (USE_OPENCL)
59+ =======
60+ ENDIF (${OpenCL_FOUND} )
61+ ENDIF (USE_OPENCL)
62+ >>>>>>> [opencl] Uppercase CMake
5463
5564# Configure CCache if available
5665IF (NOT MSVC )
You can’t perform that action at this time.
0 commit comments