From d19123327c2006998419251558b1b015852cbd03 Mon Sep 17 00:00:00 2001 From: Pablo Escobar Date: Mon, 25 Oct 2021 00:02:10 +0200 Subject: [PATCH] Basis{Importer,ImageConverter}: fix find module for CI --- modules/FindBasisUniversal.cmake | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/FindBasisUniversal.cmake b/modules/FindBasisUniversal.cmake index 69869b75f..bca12ac93 100644 --- a/modules/FindBasisUniversal.cmake +++ b/modules/FindBasisUniversal.cmake @@ -67,10 +67,21 @@ if(${_index} GREATER -1) list(REMOVE_DUPLICATES BasisUniversal_FIND_COMPONENTS) endif() -include(TestBigEndian) -test_big_endian(BIG_ENDIAN) +# This fails under Emscripten. WebAssembly is always little-endian. +if(NOT CORRADE_TARGET_EMSCRIPTEN) + include(TestBigEndian) + test_big_endian(BIG_ENDIAN) +endif() macro(_basis_setup_source_file source) + # Compile any .c files as C++. Originally I thought enable_language(C) + # being required (see above) means we don't need to do this, but things get + # complicated with CXX_STANDARD. Some compilers don't like -std=c++11 on C + # files. Even if we manage to remove that flag, some of the files require + # C99 features and it's just not worth the trouble. + set_property(SOURCE ${source} PROPERTY LANGUAGE + CXX) + # Tell Basis if we're on a big endian system. It currently doesn't figure # this out by itself. if(BIG_ENDIAN)