Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-16 00:00:02 +01:00
Code Issues Releases Wiki Activity

remove custom install path for libfmt and libspdlog to enable cmake finding cmake configs

Browse source
This commit is contained in:
Sonja Happ 2019-09-16 10:42:21 +02:00
parent be863894d8
commit 1127278e90
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packaging/docker/Dockerfile.dev-debian-multiarch
View file

@ -84,7 +84,7 @@ RUN cd /tmp && \
git clone --recursive https://github.com/fmtlib/fmt.git && \
mkdir -p fmt/build && cd fmt/build && \
git checkout 6.0.0 && \
cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make -j$(nproc) install && \
cmake .. && make -j$(nproc) install && \
rm -rf /tmp/*
# Build & Install spdlog
@ -92,7 +92,7 @@ RUN cd /tmp && \
git clone --recursive https://github.com/gabime/spdlog.git && \
mkdir -p spdlog/build && cd spdlog/build && \
git checkout v1.3.1 && \
cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 -DSPDLOG_BUILD_BENCH=OFF .. && make -j$(nproc) install && \
cmake -DSPDLOG_BUILD_BENCH=OFF .. && make -j$(nproc) install && \
rm -rf /tmp/*
# Build & Install libwebsockets

4
packaging/docker/Dockerfile.dev-ubuntu
View file

@ -85,7 +85,7 @@ RUN cd /tmp && \
git clone --recursive https://github.com/fmtlib/fmt.git && \
mkdir -p fmt/build && cd fmt/build && \
git checkout 6.0.0 && \
cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make -j$(nproc) install && \
cmake .. && make -j$(nproc) install && \
rm -rf /tmp/*
# Build & Install spdlog
@ -93,7 +93,7 @@ RUN cd /tmp && \
git clone --recursive https://github.com/gabime/spdlog.git && \
mkdir -p spdlog/build && cd spdlog/build && \
git checkout v1.3.1 && \
cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 -DSPDLOG_BUILD_BENCH=OFF .. && make -j$(nproc) install && \
cmake -DSPDLOG_BUILD_BENCH=OFF .. && make -j$(nproc) install && \
rm -rf /tmp/*
# Build & Install Criterion