From ee096edfff11ba6773793b9f0bf7aaa8bd273110 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 15 Nov 2022 20:58:05 +0100 Subject: [PATCH 1/2] chore: bump tomlplusplus Should fix issues with builds on aarch64 Signed-off-by: Sefa Eyeoglu --- libraries/tomlplusplus | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/tomlplusplus b/libraries/tomlplusplus index cc741c9f..0a90913a 160000 --- a/libraries/tomlplusplus +++ b/libraries/tomlplusplus @@ -1 +1 @@ -Subproject commit cc741c9f5f2a62856a2a2e9e275f61eb0591c09c +Subproject commit 0a90913abf9390b9e08ab6d3b40ac11634553f38 From c1763cc4b0871230a86e58aad07aacaf7b19182c Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 15 Nov 2022 21:23:20 +0100 Subject: [PATCH 2/2] fix: disable FLOAT16 in toml++ Signed-off-by: Sefa Eyeoglu --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0db05f98..8fc0d326 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,6 +70,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_DEPRECATED_WARNINGS=Y") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_DISABLE_DEPRECATED_BEFORE=0x050C00") +# Fix aarch64 build for toml++ +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTOML_ENABLE_FLOAT16=0") + # set CXXFLAGS for build targets set(CMAKE_CXX_FLAGS_RELEASE "-O2 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELEASE}")