From: Denys Dmytriyenko <[email protected]> The original regex doesn't work when TARGET_VENDOR is empty. The fix will be submitted upstream to OE-Core and can be removed locally later.
Signed-off-by: Denys Dmytriyenko <[email protected]> --- .../cmake/cmake/OEToolchainConfig.cmake | 25 ++++++++++++++++++++++ .../recipes-devtools/cmake/cmake_%.bbappend | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 meta-arago-distro/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake diff --git a/meta-arago-distro/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake b/meta-arago-distro/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake new file mode 100644 index 0000000..7db6f80 --- /dev/null +++ b/meta-arago-distro/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake @@ -0,0 +1,25 @@ +set( CMAKE_SYSTEM_NAME Linux ) +set( CMAKE_C_FLAGS $ENV{CFLAGS} CACHE STRING "" FORCE ) +set( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE STRING "" FORCE ) +set( CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE ) +set( CMAKE_LDFLAGS_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE ) +set( CMAKE_SYSROOT $ENV{OECORE_TARGET_SYSROOT} ) + +set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} ) +set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER ) +set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) +set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) +set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY ) + +set(CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX "$ENV{OE_CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX}") + +# Set CMAKE_SYSTEM_PROCESSOR from the sysroot name (assuming processor-distro-os). +if ($ENV{OECORE_TARGET_SYSROOT} MATCHES "/sysroots/([a-zA-Z0-9_-]+)-.+") + set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_MATCH_1}) +endif() + +# Include the toolchain configuration subscripts +file( GLOB toolchain_config_files "${CMAKE_TOOLCHAIN_FILE}.d/*.cmake" ) +foreach(config ${toolchain_config_files}) + include(${config}) +endforeach() diff --git a/meta-arago-distro/recipes-devtools/cmake/cmake_%.bbappend b/meta-arago-distro/recipes-devtools/cmake/cmake_%.bbappend index 042e4d7..a5f2d01 100644 --- a/meta-arago-distro/recipes-devtools/cmake/cmake_%.bbappend +++ b/meta-arago-distro/recipes-devtools/cmake/cmake_%.bbappend @@ -1 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + FILES_${PN}-doc += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}/Help/" -- 2.7.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
