add debian 11, migrate to ninja

This commit is contained in:
2021-09-08 11:12:52 +03:00
parent c8dd5b4c50
commit 8c94c2fb6f
9 changed files with 55 additions and 37 deletions

View File

@@ -9,15 +9,15 @@ WORKDIR /soft
RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
WORKDIR /soft/shstk_build_host
RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
&& make install -j${JOBS_COUNT} \
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
&& cmake --build ./ --target install -j${JOBS_COUNT} \
&& rm -rf * \
&& ldconfig
WORKDIR /soft/shstk_build_pi
RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \
&& make install -j${JOBS_COUNT} \
&& make deploy -j${JOBS_COUNT} \
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \
&& cmake --build ./ --target install -j${JOBS_COUNT} \
&& cmake --build ./ --target deploy -j${JOBS_COUNT} \
&& rm -rf *
WORKDIR /soft/src