mingw64 build fixes
This commit is contained in:
		@@ -938,8 +938,25 @@ RUN set -ex \
 | 
			
		||||
    && cd ${MY_WORKDIR} \
 | 
			
		||||
    && rm -r wxWidgets-${MY_WXWIDGETS_VERSION} 
 | 
			
		||||
 | 
			
		||||
ARG GTEST_VERSION=1.14.0
 | 
			
		||||
ENV MY_GTEST_VERSION=${GTEST_VERSION}
 | 
			
		||||
RUN set -ex \
 | 
			
		||||
    \
 | 
			
		||||
    && wget -q https://github.com/google/googletest/archive/refs/tags/v${GTEST_VERSION}.tar.gz -O - | tar -xz \
 | 
			
		||||
    && cd googletest-${MY_GTEST_VERSION} \
 | 
			
		||||
    && mkdir build \
 | 
			
		||||
    && cd build \
 | 
			
		||||
    && cmake .. -DCMAKE_TOOLCHAIN_FILE=${MY_TOOLCHAIN_FILE_CMAKE} \
 | 
			
		||||
      -DCMAKE_BUILD_TYPE=Release \
 | 
			
		||||
      -DBUILD_SHARED_LIBS=ON \
 | 
			
		||||
      -DBUILD_STATIC_LIBS=ON \
 | 
			
		||||
      -DCMAKE_INSTALL_PREFIX=${MY_MINGW} \
 | 
			
		||||
    && make -j${MY_NUM_JOBS} \
 | 
			
		||||
    && make install \
 | 
			
		||||
    && cd ${MY_WORKDIR} \
 | 
			
		||||
    && rm -r googletest-${MY_GTEST_VERSION} 
 | 
			
		||||
 | 
			
		||||
RUN set -ex \
 | 
			
		||||
    \
 | 
			
		||||
    && mv ${MY_MINGW}/lib/*.dll ${MY_MINGW}/bin \
 | 
			
		||||
    && chmod 0777 -R ${MY_MINGW}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user