From 1f8c0e79e85447c6e478155c8618d608ddff2b73 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Tue, 4 Dec 2018 11:15:49 -0500
Subject: [PATCH] cmake toolchains force cache cpu flags and don't append

 - these flags were accumlating on top of each other anytime cmake had to reconfigure
---
 boards/atlflight/eagle/CMakeLists.txt                       | 2 +-
 .../Platform/Generic-arm-none-eabi-gcc-cortex-m3.cmake      | 6 +++---
 .../Platform/Generic-arm-none-eabi-gcc-cortex-m4.cmake      | 6 +++---
 .../Platform/Generic-arm-none-eabi-gcc-cortex-m7.cmake      | 6 +++---
 .../Platform/Linux-arm-linux-gnueabihf-cortex-a53.cmake     | 6 +++---
 .../Platform/Linux-arm-linux-gnueabihf-cortex-a8.cmake      | 6 +++---
 .../Platform/Linux-arm-linux-gnueabihf-cortex-a9.cmake      | 6 +++---
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/boards/atlflight/eagle/CMakeLists.txt b/boards/atlflight/eagle/CMakeLists.txt
index 5739c31245..5d07e04eec 100644
--- a/boards/atlflight/eagle/CMakeLists.txt
+++ b/boards/atlflight/eagle/CMakeLists.txt
@@ -31,7 +31,7 @@
 #
 ############################################################################
 
-add_subdirectory(bbblue_adc)
+
 
 
 ############################################################################
diff --git a/platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m3.cmake b/platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m3.cmake
index b902cc25eb..196352b46a 100644
--- a/platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m3.cmake
+++ b/platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m3.cmake
@@ -1,6 +1,6 @@
 
 set(cpu_flags "-mcpu=cortex-m3 -mthumb")
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${cpu_flags}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${cpu_flags}")
-set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${cpu_flags} -D__ASSEMBLY__")
+set(CMAKE_C_FLAGS "${cpu_flags}" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS "${cpu_flags}" CACHE STRING "" FORCE)
+set(CMAKE_ASM_FLAGS "${cpu_flags} -D__ASSEMBLY__" CACHE STRING "" FORCE)
diff --git a/platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m4.cmake b/platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m4.cmake
index df0cda77d6..1a21bcca90 100644
--- a/platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m4.cmake
+++ b/platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m4.cmake
@@ -1,6 +1,6 @@
 
 set(cpu_flags "-mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard")
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${cpu_flags}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${cpu_flags}")
-set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${cpu_flags} -D__ASSEMBLY__")
+set(CMAKE_C_FLAGS "${cpu_flags}" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS "${cpu_flags}" CACHE STRING "" FORCE)
+set(CMAKE_ASM_FLAGS "${cpu_flags} -D__ASSEMBLY__" CACHE STRING "" FORCE)
diff --git a/platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m7.cmake b/platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m7.cmake
index 5c4645b08c..cf8865074a 100644
--- a/platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m7.cmake
+++ b/platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m7.cmake
@@ -1,6 +1,6 @@
 
 set(cpu_flags "-mcpu=cortex-m7 -mthumb -mfpu=fpv5-d16 -mfloat-abi=hard")
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${cpu_flags}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${cpu_flags}")
-set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${cpu_flags} -D__ASSEMBLY__")
+set(CMAKE_C_FLAGS "${cpu_flags}" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS "${cpu_flags}" CACHE STRING "" FORCE)
+set(CMAKE_ASM_FLAGS "${cpu_flags} -D__ASSEMBLY__" CACHE STRING "" FORCE)
diff --git a/platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a53.cmake b/platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a53.cmake
index 5b2d478b63..e5aed8944a 100644
--- a/platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a53.cmake
+++ b/platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a53.cmake
@@ -1,6 +1,6 @@
 
 set(cpu_flags "-mcpu=cortex-a53 -mfpu=neon -mfloat-abi=hard")
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${cpu_flags}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${cpu_flags}")
-set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${cpu_flags} -D__ASSEMBLY__")
+set(CMAKE_C_FLAGS "${cpu_flags}" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS "${cpu_flags}" CACHE STRING "" FORCE)
+set(CMAKE_ASM_FLAGS "${cpu_flags} -D__ASSEMBLY__" CACHE STRING "" FORCE)
diff --git a/platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a8.cmake b/platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a8.cmake
index 2f9370ca59..a0782539c4 100644
--- a/platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a8.cmake
+++ b/platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a8.cmake
@@ -1,6 +1,6 @@
 
 set(cpu_flags "-mcpu=cortex-a9 -mfpu=neon-vfpv3 -mfloat-abi=hard -mthumb-interwork")
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${cpu_flags}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${cpu_flags}")
-set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${cpu_flags} -D__ASSEMBLY__")
+set(CMAKE_C_FLAGS "${cpu_flags}" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS "${cpu_flags}" CACHE STRING "" FORCE)
+set(CMAKE_ASM_FLAGS "${cpu_flags} -D__ASSEMBLY__" CACHE STRING "" FORCE)
diff --git a/platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a9.cmake b/platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a9.cmake
index d954bcc016..fc5f19eb09 100644
--- a/platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a9.cmake
+++ b/platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a9.cmake
@@ -1,6 +1,6 @@
 
 set(cpu_flags "-mcpu=cortex-a8 -mfpu=neon-vfpv3 -mfloat-abi=hard -mthumb-interwork")
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${cpu_flags}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${cpu_flags}")
-set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${cpu_flags} -D__ASSEMBLY__")
+set(CMAKE_C_FLAGS "${cpu_flags}" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS "${cpu_flags}" CACHE STRING "" FORCE)
+set(CMAKE_ASM_FLAGS "${cpu_flags} -D__ASSEMBLY__" CACHE STRING "" FORCE)
-- 
GitLab