sigrok-cross-mingw: Drop -DENABLE_COTIRE=y.
authorUwe Hermann <uwe@hermann-uwe.de>
Thu, 30 Jan 2014 21:20:12 +0000 (22:20 +0100)
committerUwe Hermann <uwe@hermann-uwe.de>
Thu, 30 Jan 2014 21:20:12 +0000 (22:20 +0100)
This seems to cause issues on some Ubuntu versions (likely due to an
older cmake version, but we didn't investigate much). We're just
dropping the Cotire use in this script to avoid the problems, since it
is a fully optional thing (only affects compile performance) anyway.

This fixes bug #249.

cross-compile/mingw/sigrok-cross-mingw

index 11660c90f5a85eb561714fa71364e9c3ec04b0d2..c52ef22272b6e828d2b623efb8994c27ab048715 100755 (executable)
@@ -164,7 +164,7 @@ cd ..
 git clone git://sigrok.org/pulseview
 cd pulseview
 patch -p1 < ../../pulseview_decodersdir.patch
-PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_DECODE=y -DENABLE_COTIRE=y -DENABLE_TESTS=y .
+PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_DECODE=y -DENABLE_TESTS=y .
 make $PARALLEL VERBOSE=1
 make install
 makensis -DHOME=$HOME contrib/pulseview_cross.nsi