mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-15 20:50:33 +00:00
Fix make check in Ubuntu 16.04
This commit is contained in:
parent
2f2a1d8338
commit
9d23915fee
@ -31,10 +31,10 @@ endif(ENABLE_CUDA)
|
||||
|
||||
|
||||
|
||||
set(TRACKING_LIB_SOURCES
|
||||
set(TRACKING_LIB_SOURCES
|
||||
cpu_multicorrelator.cc
|
||||
cpu_multicorrelator_real_codes.cc
|
||||
cpu_multicorrelator_16sc.cc
|
||||
cpu_multicorrelator_16sc.cc
|
||||
lock_detectors.cc
|
||||
tcp_communication.cc
|
||||
tcp_packet_data.cc
|
||||
@ -74,11 +74,10 @@ file(GLOB TRACKING_LIB_HEADERS "*.h")
|
||||
list(SORT TRACKING_LIB_HEADERS)
|
||||
add_library(tracking_lib ${TRACKING_LIB_SOURCES} ${TRACKING_LIB_HEADERS})
|
||||
source_group(Headers FILES ${TRACKING_LIB_HEADERS})
|
||||
target_link_libraries(tracking_lib ${OPT_TRACKING_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
|
||||
target_link_libraries(tracking_lib ${OPT_TRACKING_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
|
||||
|
||||
if(VOLK_GNSSSDR_FOUND)
|
||||
add_dependencies(tracking_lib glog-${glog_RELEASE})
|
||||
else(VOLK_GNSSSDR_FOUND)
|
||||
add_dependencies(tracking_lib glog-${glog_RELEASE} volk_gnsssdr_module)
|
||||
endif()
|
||||
|
||||
|
@ -161,8 +161,6 @@ target_link_libraries(gnss_rx ${Boost_LIBRARIES}
|
||||
conditioner_adapters
|
||||
resampler_adapters
|
||||
acq_adapters
|
||||
tracking_lib
|
||||
# acquisition_lib
|
||||
tracking_adapters
|
||||
channel_adapters
|
||||
telemetry_decoder_libswiftcnav
|
||||
|
@ -328,8 +328,8 @@ include_directories(
|
||||
${CMAKE_SOURCE_DIR}/src/tests/common-files
|
||||
${GLOG_INCLUDE_DIRS}
|
||||
${GFlags_INCLUDE_DIRS}
|
||||
${GNURADIO_RUNTIME_INCLUDE_DIRS}
|
||||
${Boost_INCLUDE_DIRS}
|
||||
${GNURADIO_RUNTIME_INCLUDE_DIRS}
|
||||
${ARMADILLO_INCLUDE_DIRS}
|
||||
${VOLK_INCLUDE_DIRS}
|
||||
${VOLK_GNSSSDR_INCLUDE_DIRS}
|
||||
@ -605,12 +605,8 @@ if(NOT ${ENABLE_PACKAGING})
|
||||
target_link_libraries(control_thread_test ${Boost_LIBRARIES}
|
||||
${GFlags_LIBS}
|
||||
${GLOG_LIBRARIES}
|
||||
${GNURADIO_RUNTIME_LIBRARIES}
|
||||
${GTEST_LIBRARIES}
|
||||
gnss_sp_libs
|
||||
gnss_system_parameters
|
||||
gnss_rx
|
||||
${VOLK_GNSSSDR_LIBRARIES}
|
||||
)
|
||||
add_test(control_thread_test control_thread_test)
|
||||
if(NOT ${GTEST_DIR_LOCAL})
|
||||
@ -722,10 +718,10 @@ else(NOT ${GTEST_DIR_LOCAL})
|
||||
if(MATIO_FOUND)
|
||||
add_dependencies(matio_test gtest)
|
||||
else(MATIO_FOUND)
|
||||
add_dependencies(matio_test gtest matio-${GNSSSDR_MATIO_LOCAL_VERSION})
|
||||
add_dependencies(matio_test gtest matio-${GNSSSDR_MATIO_LOCAL_VERSION})
|
||||
endif(MATIO_FOUND)
|
||||
endif(NOT ${GTEST_DIR_LOCAL})
|
||||
|
||||
|
||||
add_executable(acq_test
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
|
||||
|
Loading…
Reference in New Issue
Block a user