diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-19 14:06:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-19 14:06:52 (GMT) |
| commit | 2c0e4c37624e673a6d513cffc8edb1d595d175a9 (patch) | |
| tree | 0c367f46fa19e4e8f1709b4126f4f3a6e0d74954 | |
| parent | 16ad286ead0d588a89c7a9b8f6b661c695555a55 (diff) | |
| parent | 6cee4c6a8b83487af3144446ca156476a941c155 (diff) | |
| download | CMake-2c0e4c37624e673a6d513cffc8edb1d595d175a9.zip CMake-2c0e4c37624e673a6d513cffc8edb1d595d175a9.tar.gz CMake-2c0e4c37624e673a6d513cffc8edb1d595d175a9.tar.bz2 | |
Merge topic 'CMake-cross-compiling' into release-3.19
6cee4c6a8b Restore support for cross-compiling CMake itself
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5713
| -rw-r--r-- | Source/Checks/cm_cxx_features.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake index 663d89a..7917d41 100644 --- a/Source/Checks/cm_cxx_features.cmake +++ b/Source/Checks/cm_cxx_features.cmake @@ -81,7 +81,13 @@ if(CMake_HAVE_CXX_MAKE_UNIQUE) endif() cm_check_cxx_feature(unique_ptr) if (NOT CMAKE_CXX_STANDARD LESS "17") - cm_check_cxx_feature(filesystem TRY_RUN) + if (NOT CMAKE_CROSSCOMPILING OR CMAKE_CROSSCOMPILING_EMULATOR) + cm_check_cxx_feature(filesystem TRY_RUN) + else() + # In cross-compiling mode, it is not possible to check implementation bugs + # so rely only on conformance done by compilation + cm_check_cxx_feature(filesystem) + endif() else() set(CMake_HAVE_CXX_FILESYSTEM FALSE) endif() |