Commit 6e48bf4c authored by Ghislain MARY's avatar Ghislain MARY

Do not use CMakeForceCompiler for Android and Raspberry toolchains (it breaks...

Do not use CMakeForceCompiler for Android and Raspberry toolchains (it breaks C/CXX compiler features checks).
parent 74ceb07c
......@@ -23,8 +23,6 @@
set(CMAKE_ANDROID_API 14)
set(CMAKE_ANDROID_STL_TYPE gnustl_shared)
include(CMakeForceCompiler)
set(CMAKE_CROSSCOMPILING TRUE)
set(CMAKE_POSITION_INDEPENDENT_CODE YES)
......@@ -139,8 +137,8 @@ else()
set(TOOLCHAIN_NM "${TOOLCHAIN_PREFIX}nm")
# Define the compiler
CMAKE_FORCE_C_COMPILER("${TOOLCHAIN_CC}" GNU)
CMAKE_FORCE_CXX_COMPILER("${TOOLCHAIN_CXX}" GNU)
set(CMAKE_C_COMPILER "${TOOLCHAIN_CC}")
set(CMAKE_CXX_COMPILER "${TOOLCHAIN_CXX}")
endif()
......
......@@ -38,8 +38,6 @@ set(TOOLCHAIN_STRIP "${TOOLCHAIN_HOST}-strip")
set(TOOLCHAIN_NM "${TOOLCHAIN_HOST}-nm")
include(CMakeForceCompiler)
set(CMAKE_CROSSCOMPILING TRUE)
# Define name of the target system
......@@ -47,8 +45,8 @@ set(CMAKE_SYSTEM_NAME "Linux")
set(CMAKE_SYSTEM_PROCESSOR "arm")
# Define the compiler
CMAKE_FORCE_C_COMPILER(${TOOLCHAIN_CC} GNU)
CMAKE_FORCE_CXX_COMPILER(${TOOLCHAIN_CXX} GNU)
set(CMAKE_C_COMPILER ${TOOLCHAIN_CC})
set(CMAKE_CXX_COMPILER ${TOOLCHAIN_CXX})
set(CMAKE_FIND_ROOT_PATH ${SYSROOT_PATH} ${CMAKE_INSTALL_PREFIX})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment