From aaafb7ec3f8ae9ff03fda7b4783084b4e7cf8801 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sun, 29 Jan 2017 18:18:17 +0100 Subject: [PATCH] sigrok-cross-mingw: Use MXE's cmake instead of -DCMAKE_TOOLCHAIN_FILE. Instead of supplying the MXE specific mxe-conf.cmake file to cmake via -DCMAKE_TOOLCHAIN_FILE, use the MXE- and target-specific cmake wrapper. --- cross-compile/mingw/sigrok-cross-mingw | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw index 8465f4a..4873c27 100755 --- a/cross-compile/mingw/sigrok-cross-mingw +++ b/cross-compile/mingw/sigrok-cross-mingw @@ -57,10 +57,11 @@ export PATH=$MXE/usr/bin:$PATH TOOLCHAIN_TRIPLET="$TARGET-w64-mingw32.static.posix" +CMAKE="$TOOLCHAIN_TRIPLET-cmake" + P="$PREFIX/lib/pkgconfig" P2="$MXE/usr/$TOOLCHAIN_TRIPLET/lib/pkgconfig" C="--host=$TOOLCHAIN_TRIPLET --prefix=$PREFIX CPPFLAGS=-D__printf__=__gnu_printf__" -CM="-DCMAKE_TOOLCHAIN_FILE=$MXE/usr/$TOOLCHAIN_TRIPLET/share/cmake/mxe-conf.cmake" L="--disable-shared --enable-static" if [ $TARGET = "i686" ]; then @@ -200,7 +201,7 @@ if [ $DEBUG = 1 ]; then # Allow a "DOS box" to open on Windows, it'll contain logging output. patch -p1 < ../../pv_mwindows.patch fi -cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=y . +$CMAKE -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=y . make $PARALLEL $V if [ $DEBUG = 1 ]; then make install $V -- 2.30.2