mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-30 10:54:50 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Carles Fernandez 2019-08-02 15:01:10 +02:00
commit ef90e09a36
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

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

2
src/algorithms/acquisition/adapters/CMakeLists.txt
View File

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

4
src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
View File

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

4
src/algorithms/libs/CMakeLists.txt
View File

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

2
src/core/receiver/CMakeLists.txt
View File

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

2
src/tests/CMakeLists.txt
View File

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