mirror of
https://git.yoctoproject.org/poky
synced 2026-05-05 07:39:49 +02:00
eadd66da9b
This updates CMake to the 3.12.1 stable release. All patches were rebase on top of the new source file and all them applied without changes. The number of patches has changed as all them were applied on the Git tree and re-exported, to avoid any fuzzy warnings. License-Update: new contributor added in Copyright.txt (From OE-Core rev: 439be401cd642937b45796489e8c10aa5238a963) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
From 71085723f8028b3e1c4029fc1abe1243ac49ffc6 Mon Sep 17 00:00:00 2001
|
|
From: Cody P Schafer <dev@codyps.com>
|
|
Date: Thu, 27 Apr 2017 11:35:05 -0400
|
|
Subject: [PATCH 1/5] CMakeDetermineSystem: use oe environment vars to load
|
|
default toolchain file in sdk
|
|
Organization: O.S. Systems Software LTDA.
|
|
|
|
Passing the toolchain by:
|
|
|
|
- shell aliases does not work if cmake is called by a script
|
|
- unconditionally by a wrapper script causes cmake to believe it is
|
|
configuring things when it is not (for example, `cmake --build` breaks).
|
|
|
|
The OE_CMAKE_TOOLCHAIN_FILE variable is only used as a default if no
|
|
toolchain is explicitly specified.
|
|
|
|
Setting the CMAKE_TOOLCHAIN_FILE cmake variable is marked as cached
|
|
because '-D' options are cache entries themselves.
|
|
|
|
Upstream-Status: Inappropriate [oe-core specific]
|
|
Signed-off-by: Cody P Schafer <dev@codyps.com>
|
|
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
|
---
|
|
Modules/CMakeDetermineSystem.cmake | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
|
|
index 600d5580e..32d7f1945 100644
|
|
--- a/Modules/CMakeDetermineSystem.cmake
|
|
+++ b/Modules/CMakeDetermineSystem.cmake
|
|
@@ -82,6 +82,13 @@ else()
|
|
endif()
|
|
endif()
|
|
|
|
+if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
|
|
+ if(DEFINED ENV{OE_CMAKE_TOOLCHAIN_FILE})
|
|
+ set(CMAKE_TOOLCHAIN_FILE "$ENV{OE_CMAKE_TOOLCHAIN_FILE}" CACHE FILEPATH "toolchain file")
|
|
+ message(STATUS "Toolchain file defaulted to '${CMAKE_TOOLCHAIN_FILE}'")
|
|
+ endif()
|
|
+endif()
|
|
+
|
|
# if a toolchain file is used, the user wants to cross compile.
|
|
# in this case read the toolchain file and keep the CMAKE_HOST_SYSTEM_*
|
|
# variables around so they can be used in CMakeLists.txt.
|
|
--
|
|
2.18.0
|
|
|