From 9cd795663071dae16c712e4af0defe6910233c5d Mon Sep 17 00:00:00 2001 From: "anthony@rabine.fr" Date: Tue, 18 Feb 2025 08:32:34 +0100 Subject: [PATCH] Fix CI (link and missing libfuse in base image --- story-editor/CMakeLists.txt | 8 ++++---- story-editor/delivery/Dockerfile.linux | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/story-editor/CMakeLists.txt b/story-editor/CMakeLists.txt index fe6072f..d996b8e 100644 --- a/story-editor/CMakeLists.txt +++ b/story-editor/CMakeLists.txt @@ -72,7 +72,7 @@ add_subdirectory(externals/mbedtls EXCLUDE_FROM_ALL) # ========================================================================================================================= set(CURL_USE_OPENSSL OFF CACHE BOOL "Disable OpenSSL." FORCE) set(CURL_USE_MBEDTLS ON CACHE BOOL "Use MBED TLS." FORCE) -set(MBEDTLS_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/externals/mbedtls/include) +set(MBEDTLS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/externals/mbedtls/include) set(MBEDTLS_LIBRARY ${CMAKE_BINARY_DIR}/externals/mbedtls/library/libmbedtls.a) set(MBEDX509_LIBRARY ${CMAKE_BINARY_DIR}/externals/mbedtls/library/libmbedx509.a) set(MBEDCRYPTO_LIBRARY ${CMAKE_BINARY_DIR}/externals/mbedtls/library/libmbedcrypto.a) @@ -80,8 +80,8 @@ set(MBEDCRYPTO_LIBRARY ${CMAKE_BINARY_DIR}/externals/mbedtls/library/libmbedcryp set(CURL_USE_LIBSSH2 OFF CACHE BOOL "Disable SSH." FORCE) set(CURL_USE_LIBPSL OFF CACHE BOOL "Disable PSL" FORCE) # PSL not working for cross builds (ie, mingw32), or needs to cross-build one -set(BUILD_CURL_EXE FALSE) -set(BUILD_STATIC_LIBS TRUE) +set(BUILD_CURL_EXE OFF CACHE BOOL "Disable EXE" FORCE) +set(BUILD_STATIC_LIBS ON CACHE BOOL "ENable static libs" FORCE) add_subdirectory(externals/curl EXCLUDE_FROM_ALL) @@ -295,7 +295,7 @@ elseif(WIN32) SDL3::SDL3 libcurl_static MbedTLS::mbedtls - MbedTLS::tfpsacrypto + # MbedTLS::tfpsacrypto MbedTLS::mbedx509 ws2_32.lib psapi.lib setupapi.lib cfgmgr32.lib advapi32.lib ) diff --git a/story-editor/delivery/Dockerfile.linux b/story-editor/delivery/Dockerfile.linux index 736efb1..1b2569b 100644 --- a/story-editor/delivery/Dockerfile.linux +++ b/story-editor/delivery/Dockerfile.linux @@ -40,7 +40,8 @@ RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y --no-install-rec libgbm-dev \ libegl1-mesa-dev \ libdbus-1-dev \ - libibus-1.0-dev + libibus-1.0-dev \ + libfuse2 RUN mkdir /workspace