diff options
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake index 398069eef2..870009c2ba 100644 --- a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake +++ b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake | |||
@@ -2,7 +2,6 @@ set( CMAKE_SYSTEM_NAME Linux ) | |||
2 | set( CMAKE_C_FLAGS $ENV{CFLAGS} CACHE STRING "" FORCE ) | 2 | set( CMAKE_C_FLAGS $ENV{CFLAGS} CACHE STRING "" FORCE ) |
3 | set( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE STRING "" FORCE ) | 3 | set( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE STRING "" FORCE ) |
4 | set( CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE ) | 4 | set( CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE ) |
5 | set( CMAKE_LDFLAGS_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE ) | ||
6 | set( CMAKE_SYSROOT $ENV{OECORE_TARGET_SYSROOT} ) | 5 | set( CMAKE_SYSROOT $ENV{OECORE_TARGET_SYSROOT} ) |
7 | 6 | ||
8 | set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} ) | 7 | set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} ) |
@@ -13,13 +12,13 @@ set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY ) | |||
13 | 12 | ||
14 | set(CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX "$ENV{OE_CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX}") | 13 | set(CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX "$ENV{OE_CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX}") |
15 | 14 | ||
16 | # Set CMAKE_SYSTEM_PROCESSOR from the sysroot name (assuming processor-distro-os). | 15 | set( CMAKE_SYSTEM_PROCESSOR $ENV{OECORE_TARGET_ARCH} ) |
17 | if ($ENV{SDKTARGETSYSROOT} MATCHES "/sysroots/([a-zA-Z0-9_-]+)-.+-.+") | ||
18 | set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_MATCH_1}) | ||
19 | endif() | ||
20 | 16 | ||
21 | # Include the toolchain configuration subscripts | 17 | # Include the toolchain configuration subscripts |
22 | file( GLOB toolchain_config_files "${CMAKE_TOOLCHAIN_FILE}.d/*.cmake" ) | 18 | file( GLOB toolchain_config_files "${CMAKE_TOOLCHAIN_FILE}.d/*.cmake" ) |
23 | foreach(config ${toolchain_config_files}) | 19 | foreach(config ${toolchain_config_files}) |
24 | include(${config}) | 20 | include(${config}) |
25 | endforeach() | 21 | endforeach() |
22 | |||
23 | unset(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES) | ||
24 | unset(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES) | ||