mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-15 20:50:33 +00:00
Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next
This commit is contained in:
commit
9f95175a72
@ -24,22 +24,21 @@ if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
|
|||||||
message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio")
|
message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio")
|
||||||
message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
|
message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
|
||||||
message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
|
message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
|
||||||
message(FATAL_ERROR "gnuradio-iio required for building gnss-sdr with this option enabled")
|
message(FATAL_ERROR "gnuradio-iio is required for building gnss-sdr with this option enabled")
|
||||||
endif(NOT IIO_FOUND)
|
endif(NOT IIO_FOUND)
|
||||||
set(OPT_LIBRARIES ${OPT_LIBRARIES} ${IIO_LIBRARIES})
|
set(OPT_LIBRARIES ${OPT_LIBRARIES} ${IIO_LIBRARIES})
|
||||||
set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS})
|
set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS})
|
||||||
|
|
||||||
endif(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
|
endif(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
|
||||||
|
|
||||||
if(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
|
if(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
|
||||||
find_package(libiio REQUIRED)
|
find_package(libiio REQUIRED)
|
||||||
if(NOT LIBIIO_FOUND)
|
if(NOT LIBIIO_FOUND)
|
||||||
message(STATUS "gnuradio-iio not found, its installation is required.")
|
message(STATUS "libiio not found, its installation is required.")
|
||||||
message(STATUS "Please build and install the following projects:")
|
message(STATUS "Please build and install the following projects:")
|
||||||
message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio")
|
message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio")
|
||||||
message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
|
message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
|
||||||
message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
|
message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
|
||||||
message(FATAL_ERROR "gnuradio-iio required for building gnss-sdr with this option enabled")
|
message(FATAL_ERROR "libiio is required for building gnss-sdr with this option enabled")
|
||||||
endif(NOT LIBIIO_FOUND)
|
endif(NOT LIBIIO_FOUND)
|
||||||
set(OPT_LIBRARIES ${OPT_LIBRARIES} ${LIBIIO_LIBRARIES})
|
set(OPT_LIBRARIES ${OPT_LIBRARIES} ${LIBIIO_LIBRARIES})
|
||||||
set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${LIBIIO_INCLUDE_DIRS})
|
set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${LIBIIO_INCLUDE_DIRS})
|
||||||
@ -47,34 +46,39 @@ if(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
|
|||||||
###############################################
|
###############################################
|
||||||
# FMCOMMS2 based SDR Hardware
|
# FMCOMMS2 based SDR Hardware
|
||||||
###############################################
|
###############################################
|
||||||
if(IIO_FOUND)
|
if(LIBIIO_FOUND)
|
||||||
set(OPT_SIGNAL_SOURCE_LIB_SOURCES ad9361_manager.cc)
|
set(OPT_SIGNAL_SOURCE_LIB_SOURCES ad9361_manager.cc)
|
||||||
endif(IIO_FOUND)
|
set(OPT_SIGNAL_SOURCE_LIB_HEADERS ad9361_manager.h)
|
||||||
|
endif(LIBIIO_FOUND)
|
||||||
endif(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
|
endif(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
|
||||||
|
|
||||||
if(ENABLE_AD9361)
|
|
||||||
set(OPT_SIGNAL_SOURCE_LIB_SOURCES ad9361_manager.cc)
|
|
||||||
endif(ENABLE_AD9361)
|
|
||||||
|
|
||||||
if(ENABLE_FPGA)
|
if(ENABLE_FPGA)
|
||||||
SET(OPT_SIGNAL_SOURCE_LIB_SOURCES ${OPT_SIGNAL_SOURCE_LIB_SOURCES} fpga_switch.cc)
|
set(OPT_SIGNAL_SOURCE_LIB_SOURCES ${OPT_SIGNAL_SOURCE_LIB_SOURCES} fpga_switch.cc)
|
||||||
|
set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} fpga_switch.h)
|
||||||
endif(ENABLE_FPGA)
|
endif(ENABLE_FPGA)
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${Boost_INCLUDE_DIRS}
|
${Boost_INCLUDE_DIRS}
|
||||||
|
${GLOG_INCLUDE_DIRS}
|
||||||
|
${GFlags_INCLUDE_DIRS}
|
||||||
${OPT_DRIVER_INCLUDE_DIRS}
|
${OPT_DRIVER_INCLUDE_DIRS}
|
||||||
)
|
)
|
||||||
|
|
||||||
set (SIGNAL_SOURCE_LIB_SOURCES
|
set(SIGNAL_SOURCE_LIB_SOURCES
|
||||||
rtl_tcp_commands.cc
|
rtl_tcp_commands.cc
|
||||||
rtl_tcp_dongle_info.cc
|
rtl_tcp_dongle_info.cc
|
||||||
${OPT_SIGNAL_SOURCE_LIB_SOURCES})
|
${OPT_SIGNAL_SOURCE_LIB_SOURCES}
|
||||||
|
)
|
||||||
|
|
||||||
|
set(SIGNAL_SOURCE_LIB_HEADERS
|
||||||
|
rtl_tcp_commands.h
|
||||||
|
rtl_tcp_dongle_info.h
|
||||||
|
${OPT_SIGNAL_SOURCE_LIB_HEADERS}
|
||||||
|
)
|
||||||
|
|
||||||
file(GLOB SIGNAL_SOURCE_LIB_HEADERS "*.h")
|
|
||||||
list(SORT SIGNAL_SOURCE_LIB_HEADERS)
|
list(SORT SIGNAL_SOURCE_LIB_HEADERS)
|
||||||
add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_HEADERS})
|
add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_HEADERS})
|
||||||
source_group(Headers FILES ${SIGNAL_SOURCE_LIB_HEADERS})
|
source_group(Headers FILES ${SIGNAL_SOURCE_LIB_HEADERS})
|
||||||
|
|
||||||
target_link_libraries(signal_source_lib ${OPT_LIBRARIES})
|
target_link_libraries(signal_source_lib ${OPT_LIBRARIES})
|
||||||
|
add_dependencies(signal_source_lib glog-${glog_RELEASE})
|
||||||
|
Loading…
Reference in New Issue
Block a user