Browse Source

chore(CI): Move QrEncode build from autotools to cmake

Autotools version failed to configure on macOS, and QrEncode's README says  "If
the configure script does not work well, try to use CMake." Cmake works for
both macOS and Windows.
reviewable/pr6572/r4
Anthony Bilinski 3 years ago
parent
commit
4c969a9277
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
  1. 13
      buildscripts/build_qrencode.sh
  2. 2
      buildscripts/docker/Dockerfile.windows_builder

13
buildscripts/build_qrencode.sh

@ -14,13 +14,12 @@ parse_arch --dep "qrencode" --supported "win32 win64" "$@" @@ -14,13 +14,12 @@ parse_arch --dep "qrencode" --supported "win32 win64" "$@"
"${SCRIPT_DIR}/download/download_qrencode.sh"
CFLAGS="-O2 -g0" ./configure "${HOST_OPTION}" \
--prefix="${DEP_PREFIX}" \
--enable-shared \
--disable-static \
--disable-sdltest \
--without-tools \
--without-debug
cmake . \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX="${DEP_PREFIX}" \
"${CMAKE_TOOLCHAIN_FILE}" \
-DWITH_TOOLS=OFF \
-DBUILD_SHARED_LIBS=ON
make -j "${MAKE_JOBS}"
make install

2
buildscripts/docker/Dockerfile.windows_builder

@ -190,7 +190,7 @@ RUN mkdir /export && \ @@ -190,7 +190,7 @@ RUN mkdir /export && \
cp /windows/bin/avformat-*.dll /export && \
cp /windows/bin/avutil-*.dll /export && \
cp /windows/bin/libexif-*.dll /export && \
cp /windows/bin/libqrencode.dll /export && \
cp /windows/lib/libqrencode.dll /export && \
cp /windows/bin/libsodium-*.dll /export && \
cp /windows/bin/libsqlcipher-*.dll /export && \
cp /windows/bin/libmsgpackc.dll /export && \

Loading…
Cancel
Save