From f75017e5206a2803f8dcd9dc6d1385bb939586c7 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 11 Jan 2021 20:22:54 +0100 Subject: [PATCH] Fix building when using the Xcode generator, Xcode >= 12 and CMake >= 3.19 --- CMakeLists.txt | 5 +++++ docs/changelog.md | 1 + 2 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c8f75507b..df28a6ecb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1110,6 +1110,11 @@ if(NOT VOLKGNSSSDR_FOUND) ${STRIP_VOLK_GNSSSDR_PROFILE} ${USE_THIS_PYTHON} ) + if(CMAKE_VERSION VERSION_GREATER 3.18.99 AND CMAKE_GENERATOR STREQUAL Xcode) + if(XCODE_VERSION VERSION_GREATER 11) + set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -T buildsystem=1) + endif() + endif() if(DEFINED ENV{OECORE_TARGET_SYSROOT}) set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -DCROSSCOMPILE_MULTILIB=TRUE diff --git a/docs/changelog.md b/docs/changelog.md index e04866a8f..f86b1156f 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -19,6 +19,7 @@ SPDX-FileCopyrightText: 2011-2021 Carles Fernandez-Prades = 12 and CMake >= 3.19.