mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix cross-compiling in CI

This commit is contained in:
Carles Fernandez 2020-01-13 02:08:50 +01:00
parent 5a737dd329
commit 3140d86905
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -832,8 +832,11 @@ if(NOT VOLKGNSSSDR_FOUND)
endif() endif()
endif() endif()
set(VOLK_GNSSSDR_COMPILER -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}) if(CMAKE_CROSSCOMPILING)
set(VOLK_GNSSSDR_COMPILER "")
else()
set(VOLK_GNSSSDR_COMPILER -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
endif()
find_package(ORC) find_package(ORC)
set_package_properties(ORC PROPERTIES set_package_properties(ORC PROPERTIES
PURPOSE "Used by volk_gnsssdr." PURPOSE "Used by volk_gnsssdr."
@ -860,7 +863,7 @@ if(NOT VOLKGNSSSDR_FOUND)
) )
else() else()
if(CMAKE_TOOLCHAIN_FILE) if(CMAKE_TOOLCHAIN_FILE)
set(VOLK_GNSSSDR_CMAKE_ARGS set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
) )
endif() endif()