Browse Source

cmake toolchains force cache cpu flags and don't append

- these flags were accumlating on top of each other anytime cmake had to reconfigure
sbg
Daniel Agar 6 years ago
parent
commit
1f8c0e79e8
  1. 2
      boards/atlflight/eagle/CMakeLists.txt
  2. 6
      platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m3.cmake
  3. 6
      platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m4.cmake
  4. 6
      platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m7.cmake
  5. 6
      platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a53.cmake
  6. 6
      platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a8.cmake
  7. 6
      platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a9.cmake

2
boards/atlflight/eagle/CMakeLists.txt

@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
#
############################################################################
add_subdirectory(bbblue_adc)
############################################################################

6
platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m3.cmake

@ -1,6 +1,6 @@ @@ -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)

6
platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m4.cmake

@ -1,6 +1,6 @@ @@ -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)

6
platforms/nuttx/cmake/Platform/Generic-arm-none-eabi-gcc-cortex-m7.cmake

@ -1,6 +1,6 @@ @@ -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)

6
platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a53.cmake

@ -1,6 +1,6 @@ @@ -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)

6
platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a8.cmake

@ -1,6 +1,6 @@ @@ -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)

6
platforms/posix/cmake/Platform/Linux-arm-linux-gnueabihf-cortex-a9.cmake

@ -1,6 +1,6 @@ @@ -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)

Loading…
Cancel
Save