Skip to content

Commit

Permalink
Drop boost test framework support for boost < 1.34
Browse files Browse the repository at this point in the history
As it's annoying to replace all occurances of boost/test/auto_unit_test\.hpp
 with  boost/test/included/unit_test.hpp
That's required while building for MAC and implemented not good enough.
  • Loading branch information
trufanov-nok committed Apr 7, 2018
1 parent d6ec6cd commit 9d6c939
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion imageproc/tests/main.cpp
Expand Up @@ -22,4 +22,4 @@

#define BOOST_AUTO_TEST_MAIN

#include <boost/test/auto_unit_test.hpp>
#include <boost/test/included/unit_test.hpp>
4 changes: 2 additions & 2 deletions packaging/osx/buildscantailor.sh
Expand Up @@ -93,8 +93,8 @@ cd $STSRC
# make clean
# rm CMakeCache.txt
# needed in case scantailor source is not updated to compile with new boost (>=1_34) test infrastructure
[ ! -f $STSRC/imageproc/tests/main.cpp.old ] && sed -i '.old' -e '1,$ s%^#include <boost/test/auto_unit_test\.hpp>%#include <boost/test/included/unit_test.hpp>%g' $STSRC/imageproc/tests/main.cpp
[ ! -f $STSRC/tests/main.cpp.old ] && sed -i '.old' -e '1,$ s%^#include <boost/test/auto_unit_test\.hpp>%#include <boost/test/included/unit_test.hpp>%g' $STSRC/tests/main.cpp
#[ ! -f $STSRC/imageproc/tests/main.cpp.old ] && sed -i '.old' -e '1,$ s%^#include <boost/test/auto_unit_test\.hpp>%#include <boost/test/included/unit_test.hpp>%g' $STSRC/imageproc/tests/main.cpp # hardcoded in cpp now [truf]
#[ ! -f $STSRC/tests/main.cpp.old ] && sed -i '.old' -e '1,$ s%^#include <boost/test/auto_unit_test\.hpp>%#include <boost/test/included/unit_test.hpp>%g' $STSRC/tests/main.cpp #hardcoded in cpp now [truf]
[ ! -f CMakeCache.txt ] && cmake -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET -DCMAKE_OSX_SYSROOT="$PATH_TO_SDK" -DPNG_INCLUDE_DIR=$BUILDDIR -DCMAKE_PREFIX_PATH=$HOME/Qt/5.5/clang_64/ .
# I’ve hardcoded path to Qt above [Truf]
make
Expand Down
2 changes: 1 addition & 1 deletion packaging/osx/makeapp.sh
Expand Up @@ -30,7 +30,7 @@ mkdir -p $APPF
cp $SRCDIR/packaging/osx/ScanTailorUniversal.icns $APPR/ScanTailorUniversal.icns
cp $SRCDIR/scantailor_*.qm $APPR
cp $SRCDIR/translations/qtbase_*.qm $APPR
cp $SRCDIR/scantailor $APPM/ScanTailorUniversal
cp $SRCDIR/scantailor.app/Contents/MacOS/scantailor $APPM/ScanTailorUniversal

stver=`cat $SRCDIR/version.h | grep 'VERSION "' | cut -d ' ' -f 3 | tr -d '"'`
cat $SRCDIR/packaging/osx/Info.plist.in | sed "s/@VERSION@/$stver/" > $APPC/Info.plist
Expand Down
2 changes: 1 addition & 1 deletion tests/main.cpp
Expand Up @@ -22,4 +22,4 @@

#define BOOST_AUTO_TEST_MAIN

#include <boost/test/auto_unit_test.hpp>
#include <boost/test/included/unit_test.hpp>

0 comments on commit 9d6c939

Please sign in to comment.