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:09:28 +0100
commit2d7597ee23b7c2adf40d77e8c35114a4d63aa854 (patch)
tree2ffbbd4a781ad49c855b686048a775c8060acbb1
parentc5be39df1494f33e2cae116e4930f2a0f3dd2000 (diff)
downloadopenembedded-core-contrib-2d7597ee23b7c2adf40d77e8c35114a4d63aa854.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. 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_-]+)-.+-.+")
endif()
# Include the toolchain configuration subscripts
-file( GLOB toolchain_config_files "${CMAKE_TOOLCHAIN_FILE}.d/*.cmake" )
+file( GLOB toolchain_config_files "${CMAKE_CURRENT_LIST_FILE}.d/*.cmake" )
foreach(config ${toolchain_config_files})
include(${config})
endforeach()