diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile index 25b19e9..12a171d 100644 --- a/linux-fresh/Dockerfile +++ b/linux-fresh/Dockerfile @@ -122,19 +122,6 @@ COPY qtconcurrentthreadengine.patch /opt/qt515/qtconcurrentthreadengine.patch RUN patch /opt/qt515/include/QtConcurrent/qtconcurrentthreadengine.h /opt/qt515/qtconcurrentthreadengine.patch && \ rm /opt/qt515/qtconcurrentthreadengine.patch -# Install Catch2 manually in order to use older version than vcpkg provides -RUN cd /tmp && \ - git clone --depth 1 --branch v2.13.9 https://github.com/catchorg/Catch2.git && \ - cmake -B build -S Catch2 -G Ninja \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCATCH_USE_VALGRIND=OFF \ - -DCATCH_BUILD_EXAMPLES=OFF \ - -DCATCH_ENABLE_COVERAGE=OFF \ - -DCATCH_ENABLE_WERROR=OFF \ - -DCATCH_BUILD_TESTING=ON && \ - ninja -C build install && \ - rm -rf build Catch2 - # Tell CMake to use vcpkg when looking for packages ENV VCPKG_TOOLCHAIN_FILE=/home/yuzu/vcpkg/scripts/buildsystems/vcpkg.cmake @@ -145,6 +132,7 @@ RUN cd /home/yuzu &&\ cd vcpkg &&\ ./bootstrap-vcpkg.sh &&\ ./vcpkg install \ + catch2 \ fmt \ lz4 \ nlohmann-json \