From ecfee28517d9894c2e5d12a6dc8ced9838bfb70a Mon Sep 17 00:00:00 2001
From: Martin Kojtal <martin.kojtal@arm.com>
Date: Wed, 29 Jul 2020 16:28:24 +0100
Subject: [PATCH] CMake: move env to toolchain file (#13369)

Toolchain sets target toolchain related settings that were in env. We do not need env cmake.
See https://cmake.org/cmake/help/v3.8/manual/cmake-toolchains.7.html for details
---
 cmake/app.cmake       |  1 -
 cmake/env.cmake       | 11 -----------
 cmake/toolchain.cmake |  9 +++++++++
 3 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 cmake/env.cmake

diff --git a/cmake/app.cmake b/cmake/app.cmake
index 809cb44889..add76736c9 100644
--- a/cmake/app.cmake
+++ b/cmake/app.cmake
@@ -11,7 +11,6 @@ include(.mbedbuild/mbed_config.cmake)
 include(${MBED_ROOT}/cmake/toolchain.cmake)
 include(${MBED_ROOT}/cmake/core.cmake)
 include(${MBED_ROOT}/cmake/profile.cmake)
-include(${MBED_ROOT}/cmake/env.cmake)
 include(${MBED_ROOT}/cmake/util.cmake)
 
 set_target_properties(mbed-os PROPERTIES MBED_TARGET_LABELS "${MBED_TARGET_LABELS}")
diff --git a/cmake/env.cmake b/cmake/env.cmake
deleted file mode 100644
index b1bbcf4303..0000000000
--- a/cmake/env.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-# Compiler setup
-set(CMAKE_SYSTEM_NAME Generic)
-set(CMAKE_CROSSCOMPILING TRUE)
-set(CMAKE_C_COMPILER_WORKS TRUE)
-set(CMAKE_CXX_COMPILER_WORKS TRUE)
-
-# Project setup
-enable_language(C CXX ASM)
diff --git a/cmake/toolchain.cmake b/cmake/toolchain.cmake
index 78ca9a3bf0..bd722069c5 100644
--- a/cmake/toolchain.cmake
+++ b/cmake/toolchain.cmake
@@ -6,3 +6,12 @@ if(MBEDIDE)
     set(MBED_STUDIO_ARM_COMPILER "--ide=mbed")
 endif()
 include(${MBED_ROOT}/cmake/toolchains/${MBED_TOOLCHAIN}.cmake)
+
+# Compiler setup
+set(CMAKE_SYSTEM_NAME Generic)
+set(CMAKE_CROSSCOMPILING TRUE)
+set(CMAKE_C_COMPILER_WORKS TRUE)
+set(CMAKE_CXX_COMPILER_WORKS TRUE)
+
+# Project setup
+enable_language(C CXX ASM)