suyu/build-environments
26
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #68 from abouvier/patch-1

Browse source 
fresh: use catch2 from vcpkg
This commit is contained in:
liamwhite 2023-01-22 16:09:46 -05:00 committed by GitHub
commit e02bab4939
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
linux-fresh/Dockerfile
View file

@ -122,19 +122,6 @@ COPY qtconcurrentthreadengine.patch /opt/qt515/qtconcurrentthreadengine.patch
RUN patch /opt/qt515/include/QtConcurrent/qtconcurrentthreadengine.h /opt/qt515/qtconcurrentthreadengine.patch && \ RUN patch /opt/qt515/include/QtConcurrent/qtconcurrentthreadengine.h /opt/qt515/qtconcurrentthreadengine.patch && \
rm /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 # Tell CMake to use vcpkg when looking for packages
ENV VCPKG_TOOLCHAIN_FILE=/home/yuzu/vcpkg/scripts/buildsystems/vcpkg.cmake ENV VCPKG_TOOLCHAIN_FILE=/home/yuzu/vcpkg/scripts/buildsystems/vcpkg.cmake
@ -145,6 +132,7 @@ RUN cd /home/yuzu &&\
cd vcpkg &&\ cd vcpkg &&\
./bootstrap-vcpkg.sh &&\ ./bootstrap-vcpkg.sh &&\
./vcpkg install \ ./vcpkg install \
catch2 \
fmt \ fmt \
lz4 \ lz4 \
nlohmann-json \ nlohmann-json \