move JOBS arg to windows
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
ARG DOCKER_PREFIX=wapmobil/
|
||||
FROM ${DOCKER_PREFIX}debian-base
|
||||
ARG JOBS_COUNT=8
|
||||
ARG JOBS_QT_COUNT=8
|
||||
|
||||
# versions
|
||||
ENV CUR_CMAKE_VERSION=4.3.2
|
||||
|
||||
+3
-1
@@ -1,5 +1,7 @@
|
||||
ARG DOCKER_PREFIX=wapmobil/
|
||||
ARG DOCKER_BITS=
|
||||
ARG JOBS_COUNT=8
|
||||
ARG JOBS_QT_COUNT=4
|
||||
FROM ${DOCKER_PREFIX}windows-base-${DOCKER_BITS}
|
||||
|
||||
ENV WIN_TRIPPLET=${WIN_ARCH}-w64-mingw32
|
||||
@@ -188,7 +190,7 @@ WORKDIR /soft
|
||||
RUN git clone -b hdf5_${CUR_HDF5_VERSION} --depth 1 https://github.com/HDFGroup/hdf5.git \
|
||||
&& mkdir hdf5_build && cd hdf5_build \
|
||||
&& cmake -C/soft/hdf5_cache.cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release -DHDF5_BUILD_CPP_LIB=1 -DBUILD_TESTING=0 ../hdf5 \
|
||||
&& make -j${JOBS_QT_COUNT} && make install && cd /soft && rm -rf hdf5 hdf5_build /soft/hdf5_cache.cmake
|
||||
&& make -j${JOBS_COUNT} && make install && cd /soft && rm -rf hdf5 hdf5_build /soft/hdf5_cache.cmake
|
||||
|
||||
|
||||
# curl (should be last)
|
||||
|
||||
Reference in New Issue
Block a user