summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2020-06-16 17:07:25 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-17 11:10:28 +0100
commit5e208e0ff4f3cb5f507ce2ea24f5a864f1a72658 (patch)
tree126c1714d012fac101e42511af020c56dbb739c4
parent7f7f785ed354c3b4e68109dea968756d6bff649c (diff)
downloadpoky-5e208e0ff4f3cb5f507ce2ea24f5a864f1a72658.tar.gz
cmake: allow chainloading of the toolchain file
Use path from CMAKE_CURRENT_LIST_FILE to load the cmake subscripts. This allows the toolchain file to be chainloaded from another toolchain file. (From OE-Core rev: 2d7597ee23b7c2adf40d77e8c35114a4d63aa854) Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake
index 398069eef2..8f6f3a272d 100644
--- a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake
+++ b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake
@@ -19,7 +19,7 @@ if ($ENV{SDKTARGETSYSROOT} MATCHES "/sysroots/([a-zA-Z0-9_-]+)-.+-.+")
19endif() 19endif()
20 20
21# Include the toolchain configuration subscripts 21# Include the toolchain configuration subscripts
22file( GLOB toolchain_config_files "${CMAKE_TOOLCHAIN_FILE}.d/*.cmake" ) 22file( GLOB toolchain_config_files "${CMAKE_CURRENT_LIST_FILE}.d/*.cmake" )
23foreach(config ${toolchain_config_files}) 23foreach(config ${toolchain_config_files})
24 include(${config}) 24 include(${config})
25endforeach() 25endforeach()