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

remove criterion submodule

Browse source
This commit is contained in:
Steffen Vogel 2018-08-23 15:08:10 +02:00
parent e0d379b66a
commit 25995ed300
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/.gitmodules vendored
View file

@ -1,6 +1,3 @@
[submodule "thirdparty/spdlog"]
path = thirdparty/spdlog
url = https://github.com/gabime/spdlog.git
[submodule "thirdparty/criterion"]
path = thirdparty/criterion
url = https://github.com/Snaipe/Criterion.git

7
common/Dockerfile
View file

@ -63,8 +63,11 @@ RUN dnf -y install \
openssl-devel openssl
# Build & Install Criterion
COPY thirdparty/criterion /tmp/criterion
RUN mkdir -p /tmp/criterion/build && cd /tmp/criterion/build && cmake .. && make install && rm -rf /tmp/*
RUN cd /tmp && \
git clone --recursive https://github.com/Snaipe/Criterion && \
mkdir -p Criterion/build && cd Criterion/build && \
cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make install && \
rm -rf /tmp/*
ENV LD_LIBRARY_PATH /usr/local/lib:/usr/local/lib64

1
common/thirdparty/criterion vendored

@ -1 +0,0 @@
Subproject commit 9b70365825aced7333d7867bb5c64c63919ce510