diff options
| author | Yaroslav Kazakov <YKazakov@luxoft.com> | 2014-07-10 16:09:09 +0400 |
|---|---|---|
| committer | Yaroslav Kazakov <YKazakov@luxoft.com> | 2014-07-10 16:09:09 +0400 |
| commit | ec068064622a5b56534d65e5bb9deef7c278d3a9 (patch) | |
| tree | 975771ddf697ffe7ec1cbe0cbab6f54085379f6b | |
| parent | f4af46885e573396cf7795dc59e89869a9a12dbd (diff) | |
| download | sdl_core-ec068064622a5b56534d65e5bb9deef7c278d3a9.tar.gz | |
ARM-V7 configuration support added
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | qnx_6.5.0_linux_x86.cmake | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 80e264951b..44d1a03336 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,7 @@ set(TARGET_OPTION "$ENV{TARGET}") set(MEDIA_MODE_OPTION "$ENV{MEDIA_MODE}") set(HMI_ADAPTER_OPTION "$ENV{HMI_ADAPTER}") set(ENABLE_LOG_OPTION "$ENV{ENABLE_LOG}") +set(ARCH_TYPE_OPTION "$ENV{ARCH_TYPE}") add_custom_target(pasa-tarball COMMAND ${CMAKE_SOURCE_DIR}/tools/Utils/export-customer-specific.sh ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} PASA @@ -71,6 +72,15 @@ add_custom_target(ford-tarball DEPENDS HMI_API MOBILE_API v4_protocol_v1_2_no_extra ) +if (ARCH_TYPE_OPTION) + if (NOT (${ARCH_TYPE_OPTION} STREQUAL "x86") AND NOT (${ARCH_TYPE_OPTION} STREQUAL "armv7")) + message(AUTHOR_WARNING "HW architecture is not defined using x86. Allowed values are x86/armv7") + set(ARCH_TYPE_OPTION "x86") + endif () +else () + set(ARCH_TYPE_OPTION "x86") +endif() + if (OS_TYPE_OPTION) if (${OS_TYPE_OPTION} STREQUAL "QNX") message(STATUS "Jenkins integration: set build process for QNX") diff --git a/qnx_6.5.0_linux_x86.cmake b/qnx_6.5.0_linux_x86.cmake index 205162c779..b1b62fbc2e 100644 --- a/qnx_6.5.0_linux_x86.cmake +++ b/qnx_6.5.0_linux_x86.cmake @@ -1,4 +1,4 @@ -SET(CMAKE_SYSTEM_PROCESSOR x86)
+SET(CMAKE_SYSTEM_PROCESSOR ${ARCH_TYPE_OPTION})
SET(CMAKE_SYSTEM_NAME QNX)
IF(CMAKE_HOST_LINUX)
@@ -7,7 +7,7 @@ ENDIF(CMAKE_HOST_LINUX) FIND_PATH(QNX_HOST
NAME usr/bin/qcc${HOST_EXECUTABLE_SUFFIX}
- PATHS $ENV{QNX_HOST} /opt/qnx650/host/linux/x86
+ PATHS $ENV{QNX_HOST} /opt/qnx650/host/linux/${ARCH_TYPE_OPTION}
NO_CMAKE_PATH
NO_CMAKE_ENVIRONMENT_PATH
)
@@ -23,7 +23,7 @@ IF(CMAKE_HOST_LINUX) FIND_PATH(QNX_CONFIGURATION
NAME /etc/qnx/bin/qnxactivate
PATHS $ENV{QNX_CONFIGURATION}
- "/opt/qnx650/host/linux/x86/usr/bin/qconfig"
+ "/opt/qnx650/host/linux/${ARCH_TYPE_OPTION}/usr/bin/qconfig"
NO_CMAKE_PATH
NO_CMAKE_ENVIRONMENT_PATH
)
|