diff --git a/linux/Dockerfile b/linux/Dockerfile index de0e040e2926934dfd3526651489074d06ed23bd..6f746cd7a656ba3810cc795ec3b9871664c1f287 100644 --- a/linux/Dockerfile +++ b/linux/Dockerfile @@ -24,7 +24,7 @@ WORKDIR /occt RUN git clone https://git.dev.opencascade.org/repos/occt.git --progress WORKDIR /occt/occt -ARG OCCTtHash=V7_5_1 +ARG OCCTHash=V7_5_1 RUN git fetch RUN git checkout $OCCTHash RUN git submodule update --init --recursive @@ -51,6 +51,36 @@ RUN cmake --build . --config Release --target install # When linking with static libraries, they must be ordered in dependency order RUN sed -i 's/OpenCASCADE_LIBRARIES [A-Za-z0-9;]\+/OpenCASCADE_LIBRARIES TKSTEP;TKSTEPAttr;TKSTEP209;TKSTEPBase;TKIGES;TKBool;TKMesh;TKXSBase;TKBO;TKPrim;TKShHealing;TKTopAlgo;TKBRep;TKGeomAlgo;TKGeomBase;TKG3d;TKG2d;TKMath;TKernel/' /occt_install/lib/cmake/opencascade/OpenCASCADEConfig.cmake + +# Build Assimp +WORKDIR /assimp +RUN git clone https://github.com/assimp/assimp.git --progress + +WORKDIR /assimp/assimp +ARG ASSIMPHash=v5.0.1 +RUN git fetch +RUN git checkout $ASSIMPHash +RUN git submodule update --init --recursive + +WORKDIR /assimp/assimp_build +RUN cmake \ + -DBUILD_SHARED_LIBS=OFF \ + -DASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT=OFF \ + -DASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT=OFF \ + -DASSIMP_BUILD_DXF_IMPORTER=ON \ + -DASSIMP_BUILD_FBX_IMPORTER=ON \ + -DASSIMP_BUILD_OFF_IMPORTER=ON \ + -DASSIMP_BUILD_COLLADA_IMPORTER=ON \ + -DASSIMP_BUILD_TESTS=OFF \ + -DASSIMP_BUILD_SAMPLES=OFF \ + -DASSIMP_BUILD_ASSIMP_TOOLS=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX:FILEPATH=/assimp_install \ + ../assimp + +RUN cmake --build . --config Release --parallel 16 +RUN cmake --build . --config Release --target install + # Build VTK WORKDIR /vtk RUN git clone https://gitlab.kitware.com/vtk/vtk.git --progress @@ -126,3 +156,4 @@ RUN apt install -y cmake COPY --from=Builder /occt_install /occt_install COPY --from=Builder /vtk_install /vtk_install +COPY --from=Builder /assimp_install /assimp_install