Merge pull request 'most of github repos changed to shstk mirror' (#21) from master into release
SHS Gitea/docker/pipeline/head Something is wrong with the build of this commit
SHS Gitea/docker/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #21
This commit was merged in pull request #21.
This commit is contained in:
@@ -55,7 +55,7 @@ RUN cd "$(find /opt/cmake/share -name FindGTest.cmake -type f -printf '%h' -quit
|
||||
|
||||
# GTest
|
||||
WORKDIR /soft
|
||||
RUN git clone -b ${CUR_GOOGLETEST} https://github.com/google/googletest.git \
|
||||
RUN git clone -b ${CUR_GOOGLETEST} https://git.shstk.ru/mirrors/googletest \
|
||||
&& mkdir googletest/build && cd googletest/build \
|
||||
&& cmake .. \
|
||||
&& make -j${JOBS_COUNT} && make install && cd /soft && rm -rf googletest
|
||||
|
||||
@@ -55,7 +55,7 @@ RUN cd "$(find /opt/cmake/share -name FindGTest.cmake -type f -printf '%h' -quit
|
||||
|
||||
# GTest
|
||||
WORKDIR /soft
|
||||
RUN git clone -b ${CUR_GOOGLETEST} https://github.com/google/googletest.git \
|
||||
RUN git clone -b ${CUR_GOOGLETEST} https://git.shstk.ru/mirrors/googletest \
|
||||
&& mkdir googletest/build && cd googletest/build \
|
||||
&& cmake .. \
|
||||
&& make -j${JOBS_COUNT} && make install && cd /soft && rm -rf googletest
|
||||
|
||||
@@ -167,7 +167,7 @@ ENV BUILD_TYPE=Release
|
||||
|
||||
# GTest
|
||||
WORKDIR /soft
|
||||
RUN git clone https://github.com/google/googletest.git \
|
||||
RUN git clone https://git.shstk.ru/mirrors/googletest \
|
||||
&& mkdir googletest/build && cd googletest/build \
|
||||
&& cmake -DCMAKE_INSTALL_PREFIX=/soft/windows -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake .. \
|
||||
&& make -j${JOBS_COUNT} && make install && cd /soft && rm -rf googletest
|
||||
|
||||
+3
-3
@@ -63,7 +63,7 @@ RUN mkdir -p /soft/tmp && cd /soft/tmp \
|
||||
|
||||
# GTest
|
||||
WORKDIR /soft
|
||||
RUN git clone -b v1.17.x https://github.com/google/googletest.git \
|
||||
RUN git clone -b v1.17.x https://git.shstk.ru/mirrors/googletest \
|
||||
&& mkdir googletest/build && cd googletest/build \
|
||||
&& cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN} .. \
|
||||
&& make -j${JOBS_COUNT} && make install && cd /soft && rm -rf googletest
|
||||
@@ -179,7 +179,7 @@ RUN wget -nv https://shstk.ru/files/qt-everywhere-opensource-src-${CUR_QT_VERSIO
|
||||
# OpenCV
|
||||
WORKDIR /soft
|
||||
RUN <<EOF
|
||||
git clone -b ${CUR_OPENCV_VERSION} --depth 1 https://github.com/opencv/opencv.git
|
||||
git clone -b ${CUR_OPENCV_VERSION} --depth 1 https://git.shstk.ru/mirrors/opencv
|
||||
mkdir -p ${INSTALL_DIR}/build/opencv && cd ${INSTALL_DIR}/build/opencv
|
||||
cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN} -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
|
||||
@@ -196,7 +196,7 @@ EOF
|
||||
# HDF5
|
||||
ENV CUR_HDF5_VERSION=1_14_3
|
||||
WORKDIR /soft
|
||||
RUN git clone -b hdf5_${CUR_HDF5_VERSION} --depth 1 https://github.com/HDFGroup/hdf5.git \
|
||||
RUN git clone -b hdf5_${CUR_HDF5_VERSION} --depth 1 https://git.shstk.ru/mirrors/hdf5 \
|
||||
&& 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_COUNT} && make install && cd /soft && rm -rf hdf5 hdf5_build /soft/hdf5_cache.cmake
|
||||
|
||||
Reference in New Issue
Block a user