From 1127278e90113614445c32774b6ff699d8491f86 Mon Sep 17 00:00:00 2001 From: Sonja Happ Date: Mon, 16 Sep 2019 10:42:21 +0200 Subject: [PATCH] remove custom install path for libfmt and libspdlog to enable cmake finding cmake configs --- packaging/docker/Dockerfile.dev-debian-multiarch | 4 ++-- packaging/docker/Dockerfile.dev-ubuntu | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/docker/Dockerfile.dev-debian-multiarch b/packaging/docker/Dockerfile.dev-debian-multiarch index 828a129cb..8cdc737e6 100644 --- a/packaging/docker/Dockerfile.dev-debian-multiarch +++ b/packaging/docker/Dockerfile.dev-debian-multiarch @@ -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 diff --git a/packaging/docker/Dockerfile.dev-ubuntu b/packaging/docker/Dockerfile.dev-ubuntu index b1fd71caf..c2b7942c2 100644 --- a/packaging/docker/Dockerfile.dev-ubuntu +++ b/packaging/docker/Dockerfile.dev-ubuntu @@ -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