From d2b3f98ba1a29e041ec4c4d23018f03855aec14f Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 4 May 2017 21:38:50 +0200 Subject: [PATCH] Fixed #171: cross-compiling detection. --- cmake/cmake-cxx11/Modules/CheckCXX11Features.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/cmake-cxx11/Modules/CheckCXX11Features.cmake b/cmake/cmake-cxx11/Modules/CheckCXX11Features.cmake index 05c986ce..bef7ef93 100644 --- a/cmake/cmake-cxx11/Modules/CheckCXX11Features.cmake +++ b/cmake/cmake-cxx11/Modules/CheckCXX11Features.cmake @@ -78,14 +78,14 @@ function(cxx11_check_feature FEATURE_NAME RESULT_VAR) set(_SRCFILE_FAIL "${_SRCFILE_BASE}_fail.cpp") set(_SRCFILE_FAIL_COMPILE "${_SRCFILE_BASE}_fail_compile.cpp") - if (CROSS_COMPILING) + if (CMAKE_CROSSCOMPILING) try_compile(${RESULT_VAR} "${_bindir}" "${_SRCFILE}" COMPILE_DEFINITIONS "${CXX11_COMPILER_FLAGS}") if (${RESULT_VAR} AND EXISTS ${_SRCFILE_FAIL}) try_compile(${RESULT_VAR} "${_bindir}_fail" "${_SRCFILE_FAIL}" COMPILE_DEFINITIONS "${CXX11_COMPILER_FLAGS}") endif (${RESULT_VAR} AND EXISTS ${_SRCFILE_FAIL}) - else (CROSS_COMPILING) + else (CMAKE_CROSSCOMPILING) try_run(_RUN_RESULT_VAR _COMPILE_RESULT_VAR "${_bindir}" "${_SRCFILE}" COMPILE_DEFINITIONS "${CXX11_COMPILER_FLAGS}") @@ -104,7 +104,7 @@ function(cxx11_check_feature FEATURE_NAME RESULT_VAR) set(${RESULT_VAR} FALSE) endif (_COMPILE_RESULT_VAR AND _RUN_RESULT_VAR) endif (${RESULT_VAR} AND EXISTS ${_SRCFILE_FAIL}) - endif (CROSS_COMPILING) + endif (CMAKE_CROSSCOMPILING) if (${RESULT_VAR} AND EXISTS ${_SRCFILE_FAIL_COMPILE}) try_compile(_TMP_RESULT "${_bindir}_fail_compile" "${_SRCFILE_FAIL_COMPILE}" COMPILE_DEFINITIONS "${CXX11_COMPILER_FLAGS}")