|
@@ -1,14 +1,9 @@
|
|
-FROM ubuntu:14.04
|
|
|
|
|
|
+FROM ubuntu:22.04
|
|
|
|
|
|
-RUN apt-get update && apt-get install -y \
|
|
|
|
|
|
+RUN apt-get update && apt-get install -y ninja-build \
|
|
git cmake build-essential software-properties-common
|
|
git cmake build-essential software-properties-common
|
|
|
|
|
|
-RUN add-apt-repository ppa:ubuntu-toolchain-r/test && apt-get update && apt-get install -y gcc-4.9 g++-4.9 && \
|
|
|
|
- cd /usr/bin && \
|
|
|
|
- rm gcc g++ cpp && \
|
|
|
|
- ln -s gcc-4.9 gcc && \
|
|
|
|
- ln -s g++-4.9 g++ && \
|
|
|
|
- ln -s cpp-4.9 cpp
|
|
|
|
|
|
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test && apt-get update
|
|
|
|
|
|
WORKDIR /opt
|
|
WORKDIR /opt
|
|
|
|
|
|
@@ -19,7 +14,8 @@ WORKDIR /opt/assimp
|
|
|
|
|
|
RUN git checkout master \
|
|
RUN git checkout master \
|
|
&& mkdir build && cd build && \
|
|
&& mkdir build && cd build && \
|
|
- cmake \
|
|
|
|
|
|
+ cmake -G 'Ninja' \
|
|
-DCMAKE_BUILD_TYPE=Release \
|
|
-DCMAKE_BUILD_TYPE=Release \
|
|
|
|
+ -DASSIMP_BUILD_ASSIMP_TOOLS=ON \
|
|
.. && \
|
|
.. && \
|
|
- make && make install
|
|
|
|
|
|
+ ninja -j4 && ninja install
|