diff --git a/boards/atlflight/eagle/CMakeLists.txt b/boards/atlflight/eagle/CMakeLists.txt
index 5739c31245ba7fc28bdbc290de416cfc692f6171..5d07e04eecf4281c6505f0ac63a7ba0658eaa6b9 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 b902cc25ebc934ad88e508c58e0d71bacc33df06..196352b46a00352f6e11f6bd904ccc224a12f13d 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 df0cda77d6fe948312ecdefe37afa63c11111776..1a21bcca90a65cec4ea5c94fb8e4f9986b669e36 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 5c4645b08ceb8151f0d3b8896a5630e0828f9286..cf8865074ad56452231d5a1a224763a8d0962dfb 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 5b2d478b63924ed0fe5d0f012f9658eeb815d195..e5aed8944af314fe01fcb1d0944b62b90884d98a 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 2f9370ca5920a1902c0b769fb23c929915c892fd..a0782539c4ec65cfecb38ce8101c8f1d6d6391a8 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 d954bcc016039f3c73afa8326a8af7fdae5edb08..fc5f19eb09fc3992433e17ba2b96f73e39d696e8 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)