mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-07-04 10:53:17 +00:00
Update and clean CMake scripts
This commit is contained in:
parent
02996bbc8a
commit
f1e4996091
|
@ -1,4 +1,4 @@
|
||||||
# Copyright (C) 2012-2018 (see AUTHORS file for a list of contributors)
|
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors)
|
||||||
#
|
#
|
||||||
# This file is part of GNSS-SDR.
|
# This file is part of GNSS-SDR.
|
||||||
#
|
#
|
||||||
|
@ -19,18 +19,6 @@
|
||||||
set(SIGNAL_GENERATOR_BLOCK_SOURCES signal_generator_c.cc)
|
set(SIGNAL_GENERATOR_BLOCK_SOURCES signal_generator_c.cc)
|
||||||
set(SIGNAL_GENERATOR_BLOCK_HEADERS signal_generator_c.h)
|
set(SIGNAL_GENERATOR_BLOCK_HEADERS signal_generator_c.h)
|
||||||
|
|
||||||
include_directories(
|
|
||||||
#${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
#${CMAKE_SOURCE_DIR}/src/core/system_parameters
|
|
||||||
#${CMAKE_SOURCE_DIR}/src/core/interfaces
|
|
||||||
#${CMAKE_SOURCE_DIR}/src/core/receiver
|
|
||||||
#${CMAKE_SOURCE_DIR}/src/algorithms/libs
|
|
||||||
#${GLOG_INCLUDE_DIRS}
|
|
||||||
#${GFlags_INCLUDE_DIRS}
|
|
||||||
${GNURADIO_RUNTIME_INCLUDE_DIRS}
|
|
||||||
${VOLK_GNSSSDR_INCLUDE_DIRS}
|
|
||||||
)
|
|
||||||
|
|
||||||
add_library(signal_generator_blocks
|
add_library(signal_generator_blocks
|
||||||
${SIGNAL_GENERATOR_BLOCK_SOURCES}
|
${SIGNAL_GENERATOR_BLOCK_SOURCES}
|
||||||
${SIGNAL_GENERATOR_BLOCK_HEADERS}
|
${SIGNAL_GENERATOR_BLOCK_HEADERS}
|
||||||
|
@ -41,23 +29,19 @@ source_group(Headers FILES ${SIGNAL_GENERATOR_BLOCK_HEADERS})
|
||||||
target_link_libraries(signal_generator_blocks
|
target_link_libraries(signal_generator_blocks
|
||||||
PUBLIC
|
PUBLIC
|
||||||
Boost::boost
|
Boost::boost
|
||||||
|
Gnuradio::runtime
|
||||||
gnss_system_parameters
|
gnss_system_parameters
|
||||||
${GNURADIO_RUNTIME_LIBRARIES}
|
|
||||||
${GNURADIO_FFT_LIBRARIES}
|
|
||||||
${VOLK_GNSSSDR_LIBRARIES}
|
|
||||||
${ORC_LIBRARIES}
|
|
||||||
PRIVATE
|
PRIVATE
|
||||||
gnss_sp_libs
|
gnss_sp_libs
|
||||||
|
Volkgnsssdr::volkgnsssdr
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(signal_generator_blocks PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
|
target_include_directories(signal_generator_blocks
|
||||||
|
PUBLIC
|
||||||
|
${CMAKE_SOURCE_DIR}/src/algorithms/libs
|
||||||
|
)
|
||||||
|
|
||||||
set_property(TARGET signal_generator_blocks
|
set_property(TARGET signal_generator_blocks
|
||||||
APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
|
APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
||||||
)
|
)
|
||||||
|
|
||||||
if(NOT VOLKGNSSSDR_FOUND)
|
|
||||||
add_dependencies(signal_generator_blocks volk_gnsssdr_module)
|
|
||||||
endif()
|
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
|
|
||||||
#include "gnss_signal.h"
|
#include "gnss_signal.h"
|
||||||
#include <boost/scoped_array.hpp>
|
#include <boost/scoped_array.hpp>
|
||||||
//#include <gnuradio/random.h>
|
|
||||||
#include <gnuradio/block.h>
|
#include <gnuradio/block.h>
|
||||||
#include <random>
|
#include <random>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user