From 25b539d4fc6fd20fd442599420212c392cda0d59 Mon Sep 17 00:00:00 2001 From: Renz Christian Bagaporo Date: Thu, 23 May 2019 18:20:43 +0800 Subject: [PATCH] cmake: make project includes know gcc version as well --- CMakeLists.txt | 9 --------- tools/cmake/build.cmake | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec96655dc..8b38b6aa4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,15 +9,6 @@ unset(compile_definitions) # Add the following build specifications here, since these seem to be dependent # on config values on the root Kconfig. -# Temporary trick to support both gcc5 and gcc8 builds -if(CMAKE_C_COMPILER_VERSION VERSION_EQUAL 5.2.0) - set(GCC_NOT_5_2_0 0 CACHE STRING "GCC is 5.2.0 version") -else() - set(GCC_NOT_5_2_0 1 CACHE STRING "GCC is not 5.2.0 version") -endif() - -list(APPEND compile_definitions "-DGCC_NOT_5_2_0=${GCC_NOT_5_2_0}") - if(CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE) list(APPEND compile_options "-Os") else() diff --git a/tools/cmake/build.cmake b/tools/cmake/build.cmake index af335d3f1..306486c16 100644 --- a/tools/cmake/build.cmake +++ b/tools/cmake/build.cmake @@ -442,6 +442,14 @@ macro(idf_build_process target) idf_build_set_property(___COMPONENT_REQUIRES_COMMON ${lib} APPEND) endforeach() + # Temporary trick to support both gcc5 and gcc8 builds + if(CMAKE_C_COMPILER_VERSION VERSION_EQUAL 5.2.0) + set(GCC_NOT_5_2_0 0 CACHE STRING "GCC is 5.2.0 version") + else() + set(GCC_NOT_5_2_0 1 CACHE STRING "GCC is not 5.2.0 version") + endif() + idf_build_set_property(COMPILE_DEFINITIONS "-DGCC_NOT_5_2_0" APPEND) + # All targets built under this scope is with the ESP-IDF build system set(ESP_PLATFORM 1) idf_build_set_property(COMPILE_DEFINITIONS "-DESP_PLATFORM" APPEND)