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

fixed some cmakefiles to allow for the correct compilation of the gnss-sdr with the FPGA option and the unit test extra options at the same time.

Browse Source
This commit is contained in:
Marc Majoral 2018-08-10 10:04:47 +02:00
parent 557d25d3ea
commit 3b154c57c2
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,5 @@
add_subdirectory(adapters) add_subdirectory(adapters)
add_subdirectory(gnuradio_blocks) add_subdirectory(gnuradio_blocks)
if(ENABLE_FPGA)
add_subdirectory(libs) add_subdirectory(libs)
endif(ENABLE_FPGA)

10
src/tests/CMakeLists.txt
View File

@ -211,7 +211,7 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
find_package(GPSTK) find_package(GPSTK)
if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
message(STATUS "GPSTk v${GNSSSDR_GPSTK_LOCAL_VERSION} will be automatically downloaded and built when doing 'make'.") message(STATUS "GPSTk v${GNSSSDR_GPSTK_LOCAL_VERSION} will be automatically downloaded and built when doing 'make'.")
if(NOT ENABLE_FPGA) # if(NOT ENABLE_FPGA)
if(CMAKE_VERSION VERSION_LESS 3.2) if(CMAKE_VERSION VERSION_LESS 3.2)
ExternalProject_Add( ExternalProject_Add(
gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
@ -245,10 +245,10 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
add_definitions(-DGPSTK_BINDIR="${GPSTK_BINDIR}") add_definitions(-DGPSTK_BINDIR="${GPSTK_BINDIR}")
set(gpstk_libs gpstk) set(gpstk_libs gpstk)
set(OWN_GPSTK True) set(OWN_GPSTK True)
else(NOT ENABLE_FPGA) # else(NOT ENABLE_FPGA)
message(STATUS "GPSTk has not been found, try to install it on target.") # message(STATUS "GPSTk has not been found, try to install it on target.")
message(STATUS "Some extra tests requiring GPSTk will not be built.") # message(STATUS "Some extra tests requiring GPSTk will not be built.")
endif(NOT ENABLE_FPGA) # endif(NOT ENABLE_FPGA)
else(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) else(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
set(gpstk_libs ${GPSTK_LIBRARIES}) set(gpstk_libs ${GPSTK_LIBRARIES})
set(GPSTK_INCLUDE_DIRS ${GPSTK_INCLUDE_DIR}) set(GPSTK_INCLUDE_DIRS ${GPSTK_INCLUDE_DIR})