From 38527ae26360b2071a19665aa677e9bdc1e59df3 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 26 Jan 2020 14:24:38 +0100 Subject: [PATCH] Allow custom CMake toolchain file when using OpenEmbedded --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5955170a0..8a02d1ec8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -861,9 +861,13 @@ if(NOT VOLKGNSSSDR_FOUND) ) if(DEFINED ENV{OECORE_TARGET_SYSROOT}) set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/Toolchains/oe-sdk_cross.cmake -DCROSSCOMPILE_MULTILIB=TRUE ) + if(NOT CMAKE_TOOLCHAIN_FILE) + set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/Toolchains/oe-sdk_cross.cmake + ) + endif() else() if(CMAKE_TOOLCHAIN_FILE) set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}