From: Samuli Piippo Date: Tue, 16 Jun 2020 14:07:25 +0000 (+0300) Subject: cmake: allow chainloading of the toolchain file X-Git-Tag: uninative-2.9~461 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2d7597ee23b7c2adf40d77e8c35114a4d63aa854;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- 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()