Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into release0011

CMakeLists.txt

@@ -2056,13 +2056,15 @@ set_package_properties(OPENCL PROPERTIES
     PURPOSE "Used in some processing block implementations."
     TYPE OPTIONAL
 )
+if(NOT OPENCL_FOUND)
+    set(ENABLE_OPENCL OFF)
+endif()
 if(ENABLE_OPENCL)
-    find_package(OPENCL)
     if(DEFINED ENV{DISABLE_OPENCL})
         set(DISABLE_OPENCL TRUE)
     endif()
     if(DISABLE_OPENCL)
-        set(OPENCL_FOUND FALSE)
+        set(ENABLE_OPENCL OFF)
     else()
         if(OPENCL_FOUND)
             message(STATUS "OpenCL has been found and will be used by some processing blocks")
@@ -2070,7 +2072,7 @@ if(ENABLE_OPENCL)
         endif()
     endif()
     if(ENABLE_GENERIC_ARCH)
-        set(OPENCL_FOUND FALSE)
+        set(ENABLE_OPENCL OFF)
         message(STATUS "ENABLE_GENERIC_ARCH is set to ON so the use of OpenCL has been disabled.")
     endif()
     if(NOT OPENCL_FOUND)

src/algorithms/acquisition/adapters/CMakeLists.txt

@@ -76,7 +76,7 @@ if(ENABLE_FPGA)
     )
 endif()
 
-if(OPENCL_FOUND)
+if(ENABLE_OPENCL)
     set(ACQ_ADAPTER_SOURCES
         ${ACQ_ADAPTER_SOURCES}
         gps_l1_ca_pcps_opencl_acquisition.cc

src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt

@@ -44,7 +44,7 @@ if(ENABLE_FPGA)
     set(ACQ_GR_BLOCKS_HEADERS ${ACQ_GR_BLOCKS_HEADERS} pcps_acquisition_fpga.h)
 endif()
 
-if(OPENCL_FOUND)
+if(ENABLE_OPENCL)
     set(ACQ_GR_BLOCKS_SOURCES ${ACQ_GR_BLOCKS_SOURCES} pcps_opencl_acquisition_cc.cc)
     set(ACQ_GR_BLOCKS_HEADERS ${ACQ_GR_BLOCKS_HEADERS} pcps_opencl_acquisition_cc.h)
 endif()
@@ -97,7 +97,7 @@ if(CMAKE_BUILD_TYPE MATCHES Rel)
     )
 endif()
 
-if(OPENCL_FOUND)
+if(ENABLE_OPENCL)
     target_link_libraries(acquisition_gr_blocks PUBLIC OpenCL::OpenCL)
     target_include_directories(acquisition_gr_blocks
         PUBLIC

src/algorithms/libs/CMakeLists.txt

@@ -67,7 +67,7 @@ set(GNSS_SPLIBS_HEADERS
     geofunctions.h
 )
 
-if(OPENCL_FOUND)
+if(ENABLE_OPENCL)
     set(GNSS_SPLIBS_SOURCES ${GNSS_SPLIBS_SOURCES}
         opencl/fft_execute.cc # Needs OpenCL
         opencl/fft_setup.cc # Needs OpenCL
@@ -111,7 +111,7 @@ target_link_libraries(algorithms_libs
         Glog::glog
 )
 
-if(OPENCL_FOUND)
+if(ENABLE_OPENCL)
     target_link_libraries(algorithms_libs PUBLIC OpenCL::OpenCL)
     target_include_directories(algorithms_libs PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/opencl

src/core/receiver/CMakeLists.txt

@@ -109,7 +109,7 @@ if(ENABLE_FLEXIBAND)
     target_compile_definitions(core_receiver PRIVATE -DFLEXIBAND_DRIVER=1)
 endif()
 
-if(OPENCL_FOUND)
+if(ENABLE_OPENCL)
     message(STATUS "Adding processing blocks implemented using OpenCL")
     target_link_libraries(core_receiver PUBLIC algorithms_libs OpenCL::OpenCL)
     target_compile_definitions(core_receiver PRIVATE -DOPENCL_BLOCKS=1)

src/tests/CMakeLists.txt

@@ -149,7 +149,7 @@ if(OPENSSL_FOUND)
     add_definitions(-DUSE_OPENSSL_FALLBACK=1)
 endif()
 
-if(OPENCL_FOUND)
+if(ENABLE_OPENCL)
     add_definitions(-DOPENCL_BLOCKS_TEST=1)
 endif()