diff options
| author | Matias Fontanini <matias.fontanini@gmail.com> | 2019-02-07 09:01:47 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-07 09:01:47 -0800 |
| commit | d8d1dc003bb15517935c3d7c12aed0a463438304 (patch) | |
| tree | a4d395628fd34aca6695b1f48da04d5ac652a5a9 | |
| parent | 1f5456b18b890d16228b1bbefac3e3e69ee68850 (diff) | |
| parent | c2bb52b82fc07b1082f025ad4d73697c4304be9c (diff) | |
Merge pull request #330 from danvratil/fix-crosscompilation-check
Fix check whether we are crosscompiling
| -rw-r--r-- | cmake/Modules/CheckCXXFeatures.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/Modules/CheckCXXFeatures.cmake b/cmake/Modules/CheckCXXFeatures.cmake index 313f96f..b7b7f14 100644 --- a/cmake/Modules/CheckCXXFeatures.cmake +++ b/cmake/Modules/CheckCXXFeatures.cmake @@ -79,14 +79,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}") @@ -105,7 +105,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}") |