1From 89f6c846f02ad6d30b9ebb7eaaaa4fb6f9cec054 Mon Sep 17 00:00:00 2001 2From: Cody P Schafer <dev@codyps.com> 3Date: Thu, 27 Apr 2017 11:35:05 -0400 4Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default 5 toolchain file in sdk 6 7Passing the toolchain by: 8 9 - shell aliases does not work if cmake is called by a script 10 - unconditionally by a wrapper script causes cmake to believe it is 11 configuring things when it is not (for example, `cmake --build` breaks). 12 13The OE_CMAKE_TOOLCHAIN_FILE variable is only used as a default if no 14toolchain is explicitly specified. 15 16Setting the CMAKE_TOOLCHAIN_FILE cmake variable is marked as cached 17because '-D' options are cache entries themselves. 18 19Upstream-Status: Inappropriate [oe-core specific] 20Signed-off-by: Cody P Schafer <dev@codyps.com> 21Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 22 23--- 24 Modules/CMakeDetermineSystem.cmake | 7 +++++++ 25 1 file changed, 7 insertions(+) 26 27diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake 28index 8c7af067..ade2b189 100644 29--- a/Modules/CMakeDetermineSystem.cmake 30+++ b/Modules/CMakeDetermineSystem.cmake 31@@ -112,6 +112,13 @@ else() 32 endif() 33 endif() 34 35+if(NOT DEFINED CMAKE_TOOLCHAIN_FILE) 36+ if(DEFINED ENV{OE_CMAKE_TOOLCHAIN_FILE}) 37+ set(CMAKE_TOOLCHAIN_FILE "$ENV{OE_CMAKE_TOOLCHAIN_FILE}" CACHE FILEPATH "toolchain file") 38+ message(STATUS "Toolchain file defaulted to '${CMAKE_TOOLCHAIN_FILE}'") 39+ endif() 40+endif() 41+ 42 # if a toolchain file is used, the user wants to cross compile. 43 # in this case read the toolchain file and keep the CMAKE_HOST_SYSTEM_* 44 # variables around so they can be used in CMakeLists.txt. 45