From 33d9eb2b99c4edd5c9c77ccad4b1eeaf93849122 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 17 Oct 2019 16:25:22 +0200 Subject: Work around cmake issue breaking C++ feature detection on Android As per https://gitlab.kitware.com/cmake/cmake/issues/19515, the version of CMake we're currently using in the CI has an issue detecting clang as GNU compatible C++ frontend and thus fails to convert the values in the CMAKE_C/CXX_STANDARD variables to compiler flags correctly. Work around this for now as suggested in the upstream ticket. We can remove this when upgrading to a newer cmake version. Change-Id: I0ea37503c086ff86e05c50b812474522a7737b20 Reviewed-by: Alexandru Croitor --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 6b0ddd46..5236af9c 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -27,4 +27,4 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DVCPKG_TARGET_TRIPLET=arm64-android'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DVCPKG_TARGET_TRIPLET=arm64-android -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU'] -- cgit v1.2.3