mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 12:10:34 +00:00
Code Issues Releases Wiki Activity

Fix building in modern environments

Browse Source
This commit is contained in:
Carles Fernandez 2021-01-15 15:03:36 +01:00
parent 4fea48f603
commit 11f13ebcab
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tests/CMakeLists.txt
View File

@ -333,6 +333,9 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
endif() endif()
include(GNUInstallDirs) include(GNUInstallDirs)
find_program(Patch_EXECUTABLE NAME patch PATHS ENV PATH) find_program(Patch_EXECUTABLE NAME patch PATHS ENV PATH)
if(Patch_EXECUTABLE-NOTFOUND)
message(FATAL_ERROR "The patch command is not found. Please check your OS documentation and install it.")
endif()
set(GPSTK_PATCH_COMMAND set(GPSTK_PATCH_COMMAND
cd ${CMAKE_BINARY_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} && cd ${CMAKE_BINARY_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} &&
${Patch_EXECUTABLE} ${CMAKE_BINARY_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/CMakeLists.txt < ${CMAKE_SOURCE_DIR}/src/tests/data/gpstk_static.patch ${Patch_EXECUTABLE} ${CMAKE_BINARY_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/CMakeLists.txt < ${CMAKE_SOURCE_DIR}/src/tests/data/gpstk_static.patch
@ -621,6 +624,27 @@ if(ENABLE_FPGA)
else() else()
target_link_libraries(gps_l1_ca_dll_pll_tracking_test_fpga PRIVATE Boost::filesystem Boost::system) target_link_libraries(gps_l1_ca_dll_pll_tracking_test_fpga PRIVATE Boost::filesystem Boost::system)
endif() endif()
if(USE_GENERIC_LAMBDAS)
set(has_generic_lambdas HAS_GENERIC_LAMBDA=1)
set(no_has_generic_lambdas HAS_GENERIC_LAMBDA=0)
target_compile_definitions(gps_l1_ca_dll_pll_tracking_test_fpga
PRIVATE
"$<$<COMPILE_FEATURES:cxx_generic_lambdas>:${has_generic_lambdas}>"
"$<$<NOT:$<COMPILE_FEATURES:cxx_generic_lambdas>>:${no_has_generic_lambdas}>"
)
else()
target_compile_definitions(gps_l1_ca_dll_pll_tracking_test_fpga
PRIVATE
-DHAS_GENERIC_LAMBDA=0
)
endif()
if(USE_BOOST_BIND_PLACEHOLDERS)
target_compile_definitions(gps_l1_ca_dll_pll_tracking_test_fpga
PRIVATE
-DUSE_BOOST_BIND_PLACEHOLDERS=1
)
endif()
target_link_libraries(gps_l1_ca_dll_pll_tracking_test_fpga target_link_libraries(gps_l1_ca_dll_pll_tracking_test_fpga
PRIVATE PRIVATE
Armadillo::armadillo Armadillo::armadillo

2
src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
View File

@ -1,5 +1,5 @@
/*! /*!
* \file gps_l1_ca_dll_pll_tracking_test.cc * \file gps_l1_ca_dll_pll_tracking_test_fpga.cc
* \brief This class implements a tracking test for Galileo_E5a_DLL_PLL_Tracking * \brief This class implements a tracking test for Galileo_E5a_DLL_PLL_Tracking
* implementation based on some input parameters. * implementation based on some input parameters.
* \author Marc Majoral, 2017. mmajoral(at)cttc.cat * \author Marc Majoral, 2017. mmajoral(at)cttc.cat