dev

2026-05-06 22:11:24 +03:00
parent 3f7b293846
commit a19e7fb602
1 changed files with 12 additions and 12 deletions
@@ -78,6 +78,18 @@ RUN git clone -b v1.17.x https://github.com/google/googletest.git \
 && make -j${JOBS_COUNT} && make install && cd /soft && rm -rf googletest


+# assimp
+WORKDIR /soft
+RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
+ && tar -xf v${CUR_ASSIMP_VERSION}.tar.gz -C /soft \
+ && rm -f v${CUR_ASSIMP_VERSION}.tar.gz \
+ && mkdir -p ${INSTALL_DIR}/build/assimp && cd ${INSTALL_DIR}/build/assimp \
+ && cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
+ -DASSIMP_BUILD_ASSIMP_TOOLS=0 -DASSIMP_BUILD_TESTS=0 -DASSIMP_WARNINGS_AS_ERRORS=0 \
+ -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN} /soft/assimp-${CUR_ASSIMP_VERSION} \
+ && make install -j${JOBS_COUNT} && rm -rf ./* && rm -rf /soft/assimp-${CUR_ASSIMP_VERSION}
+
+
 # sodium
 WORKDIR /soft
 RUN curl -s https://download.libsodium.org/libsodium/releases/libsodium-${CUR_SODIUM_VERSION}.tar.gz \
@@ -105,18 +117,6 @@ RUN wget -v http://www.fftw.org/fftw-${CUR_FFTW_VERSION}.tar.gz \
 && rm -rf /soft/fftw-*


-# assimp
-WORKDIR /soft
-RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
- && tar -xf v${CUR_ASSIMP_VERSION}.tar.gz -C /soft \
- && rm -f v${CUR_ASSIMP_VERSION}.tar.gz \
- && mkdir -p ${INSTALL_DIR}/build/assimp && cd ${INSTALL_DIR}/build/assimp \
- && cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
- -DASSIMP_BUILD_ASSIMP_TOOLS=0 -DASSIMP_BUILD_TESTS=0 -DASSIMP_WARNINGS_AS_ERRORS=0 \
- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN} /soft/assimp-${CUR_ASSIMP_VERSION} \
- && TERM=xterm make install -j${JOBS_COUNT} && rm -rf ./* && rm -rf /soft/assimp-${CUR_ASSIMP_VERSION}
-
-
 # markdown
 RUN mkdir -p /soft/discount-${CUR_DISCOUNT_VERSION}/cmake && mkdir -p /soft/linux/build/discount && mkdir -p ${INSTALL_DIR}/build/discount
 WORKDIR /soft