From d896e8f29ae053a85c9191ed4a212c1fba83cd18 Mon Sep 17 00:00:00 2001 From: GeorgH93 Date: Tue, 21 May 2024 12:19:11 +0200 Subject: [PATCH] Update dependencies --- .gitea/workflows/build_pc.yml | 2 +- 3rdParty/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build_pc.yml b/.gitea/workflows/build_pc.yml index 63121b4..57af470 100644 --- a/.gitea/workflows/build_pc.yml +++ b/.gitea/workflows/build_pc.yml @@ -43,7 +43,7 @@ jobs: cache: true - name: Install Dev Packages if: matrix.config.os == 'ubuntu-latest' - run: sudo apt update && sudo apt install -y extra-cmake-modules libwayland-dev libxkbcommon-dev xorg-dev libarchive-dev libjpeg-turbo8-dev + run: sudo apt update && sudo apt install -y extra-cmake-modules libwayland-dev libxkbcommon-dev xorg-dev libarchive-dev libturbojpeg0-dev libassimp-dev - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - name: Build diff --git a/3rdParty/CMakeLists.txt b/3rdParty/CMakeLists.txt index 14be02a..a40f3d2 100644 --- a/3rdParty/CMakeLists.txt +++ b/3rdParty/CMakeLists.txt @@ -2,10 +2,10 @@ add_subdirectory(glm) if (NOT ANDROID AND NOT IOS) add_subdirectory(glfw) add_subdirectory(ftxui) + add_subdirectory(assimp) endif() add_subdirectory(fmt) add_subdirectory(spdlog) -#add_subdirectory(assimp) add_subdirectory(yaml-cpp) add_subdirectory(magic-enum) add_subdirectory(pugixml)