mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-09 19:40:04 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next

Browse Source
This commit is contained in:
Carles Fernandez 2019-04-02 03:32:11 +02:00
commit 7d1cb68a36
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
CMakeLists.txt
View File

@ -571,9 +571,11 @@ set_package_properties(Threads PROPERTIES
################################################################################ ################################################################################
enable_testing() enable_testing()
if(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING) if(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING)
if(EXISTS $ENV{GTEST_DIR}) if(NOT GTEST_DIR)
set(GTEST_DIR $ENV{GTEST_DIR}) if(DEFINED ENV{GTEST_DIR})
message(STATUS "Googletest root folder set at ${GTEST_DIR}") set(GTEST_DIR $ENV{GTEST_DIR})
message(STATUS "Googletest root folder set at ${GTEST_DIR}")
endif()
endif() endif()
endif() endif()
@ -588,9 +590,6 @@ if(NOT GOOGLETEST_FOUND)
set_package_properties(GOOGLETEST PROPERTIES set_package_properties(GOOGLETEST PROPERTIES
PURPOSE "Googletest v${GNSSSDR_GTEST_LOCAL_VERSION} will be downloaded and built when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'." PURPOSE "Googletest v${GNSSSDR_GTEST_LOCAL_VERSION} will be downloaded and built when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'."
) )
if(GTEST_DIR)
message(FATAL_ERROR " Googletest source code has not been found at ${GTEST_DIR}.")
endif()
endif() endif()
@ -989,7 +988,7 @@ if(NOT VOLKGNSSSDR_FOUND)
${STRIP_VOLK_GNSSSDR_PROFILE} ${STRIP_VOLK_GNSSSDR_PROFILE}
${USE_THIS_PYTHON} ${USE_THIS_PYTHON}
) )
if(EXISTS $ENV{OECORE_TARGET_SYSROOT}) if(DEFINED ENV{OECORE_TARGET_SYSROOT})
set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/Toolchains/oe-sdk_cross.cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/Toolchains/oe-sdk_cross.cmake
-DCROSSCOMPILE_MULTILIB=TRUE -DCROSSCOMPILE_MULTILIB=TRUE
@ -1735,7 +1734,7 @@ if(NOT PUGIXML_FOUND)
message(STATUS " PugiXML v${GNSSSDR_PUGIXML_LOCAL_VERSION} will be downloaded and built when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'.") message(STATUS " PugiXML v${GNSSSDR_PUGIXML_LOCAL_VERSION} will be downloaded and built when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'.")
set(PUGIXML_COMPILER -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}) set(PUGIXML_COMPILER -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
set(TOOLCHAIN_ARG "") set(TOOLCHAIN_ARG "")
if(EXISTS $ENV{OECORE_TARGET_SYSROOT}) if(DEFINED ENV{OECORE_TARGET_SYSROOT})
set(PUGIXML_COMPILER "") set(PUGIXML_COMPILER "")
set(TOOLCHAIN_ARG "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/Toolchains/oe-sdk_cross.cmake") set(TOOLCHAIN_ARG "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/Toolchains/oe-sdk_cross.cmake")
endif() endif()
@ -1873,7 +1872,7 @@ set_package_properties(OPENCL PROPERTIES
) )
if(ENABLE_OPENCL) if(ENABLE_OPENCL)
find_package(OPENCL) find_package(OPENCL)
if($ENV{DISABLE_OPENCL}) if(DEFINED ENV{DISABLE_OPENCL})
set(DISABLE_OPENCL TRUE) set(DISABLE_OPENCL TRUE)
endif() endif()
if(DISABLE_OPENCL) if(DISABLE_OPENCL)
@ -1900,7 +1899,7 @@ endif()
################################################################################ ################################################################################
# CUDA (OPTIONAL) # CUDA (OPTIONAL)
################################################################################ ################################################################################
if($ENV{CUDA_GPU_ACCEL}) if(DEFINED ENV{CUDA_GPU_ACCEL})
message(STATUS "CUDA_GPU_ACCEL environment variable found.") message(STATUS "CUDA_GPU_ACCEL environment variable found.")
set(ENABLE_CUDA ON) set(ENABLE_CUDA ON)
endif() endif()
@ -1963,7 +1962,7 @@ endif()
# gr-osmosdr - OPTIONAL # gr-osmosdr - OPTIONAL
# https://github.com/osmocom/gr-osmosdr # https://github.com/osmocom/gr-osmosdr
########################################## ##########################################
if($ENV{RTLSDR_DRIVER}) if(DEFINED ENV{RTLSDR_DRIVER})
message(STATUS "RTLSDR_DRIVER environment variable found.") message(STATUS "RTLSDR_DRIVER environment variable found.")
set(ENABLE_OSMOSDR ON) set(ENABLE_OSMOSDR ON)
endif() endif()
@ -2023,7 +2022,7 @@ set_package_properties(LIBIIO PROPERTIES
############################################## ##############################################
# TELEORBIT FLEXIBAND FRONTEND - OPTIONAL # TELEORBIT FLEXIBAND FRONTEND - OPTIONAL
############################################## ##############################################
if($ENV{FLEXIBAND_DRIVER}) if(DEFINED ENV{FLEXIBAND_DRIVER})
message(STATUS "FLEXIBAND_DRIVER environment variable found.") message(STATUS "FLEXIBAND_DRIVER environment variable found.")
set(ENABLE_FLEXIBAND ON) set(ENABLE_FLEXIBAND ON)
endif() endif()
@ -2055,7 +2054,7 @@ endif()
###################### ######################
# GN3S - OPTIONAL # GN3S - OPTIONAL
###################### ######################
if($ENV{GN3S_DRIVER}) if(DEFINED ENV{GN3S_DRIVER})
message(STATUS "GN3S_DRIVER environment variable found.") message(STATUS "GN3S_DRIVER environment variable found.")
set(ENABLE_GN3S ON) set(ENABLE_GN3S ON)
endif() endif()
@ -2081,7 +2080,7 @@ endif()
####################################################### #######################################################
# CTTC's digital array beamformer prototype - OPTIONAL # CTTC's digital array beamformer prototype - OPTIONAL
####################################################### #######################################################
if($ENV{RAW_ARRAY_DRIVER}) if(DEFINED ENV{RAW_ARRAY_DRIVER})
message(STATUS "RAW_ARRAY_DRIVER environment variable found.") message(STATUS "RAW_ARRAY_DRIVER environment variable found.")
set(ENABLE_ARRAY ON) set(ENABLE_ARRAY ON)
endif() endif()

4
src/tests/CMakeLists.txt
View File

@ -25,7 +25,7 @@ add_subdirectory(system-tests/libs)
################################################################################ ################################################################################
set(GTEST_COMPILER -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}) set(GTEST_COMPILER -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
set(TOOLCHAIN_ARG "") set(TOOLCHAIN_ARG "")
if(EXISTS $ENV{OECORE_TARGET_SYSROOT}) if(DEFINED ENV{OECORE_TARGET_SYSROOT})
set(GTEST_COMPILER "") set(GTEST_COMPILER "")
set(TOOLCHAIN_ARG "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/Toolchains/oe-sdk_cross.cmake") set(TOOLCHAIN_ARG "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/Toolchains/oe-sdk_cross.cmake")
else() else()
@ -193,7 +193,7 @@ set_package_properties(GPSTK PROPERTIES
if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA) if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
if(ENABLE_FPGA) if(ENABLE_FPGA)
set(CROSS_INSTALL_DIR "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}") set(CROSS_INSTALL_DIR "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
if(EXISTS $ENV{OECORE_TARGET_SYSROOT}) if(DEFINED ENV{OECORE_TARGET_SYSROOT})
set(CROSS_INSTALL_DIR "${CROSS_INSTALL_DIR} -DBOOST_ROOT=$ENV{OECORE_TARGET_SYSROOT}/usr") set(CROSS_INSTALL_DIR "${CROSS_INSTALL_DIR} -DBOOST_ROOT=$ENV{OECORE_TARGET_SYSROOT}/usr")
endif() endif()
else() else()