Merge branch 'travis' of github.com:assimp/assimp into travis
commit
72eb2e0c4e
|
@ -1,5 +1,5 @@
|
||||||
before_install:
|
before_install:
|
||||||
- sudo apt-get install cmake libcppunit-dev
|
- sudo apt-get install cmake libcppunit-dev python3
|
||||||
|
|
||||||
env:
|
env:
|
||||||
- TRAVIS_NO_EXPORT=YES
|
- TRAVIS_NO_EXPORT=YES
|
||||||
|
@ -17,6 +17,7 @@ script:
|
||||||
- cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -STATIC_BUILD=$TRAVIS_STATIC_BUILD
|
- cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -STATIC_BUILD=$TRAVIS_STATIC_BUILD
|
||||||
- make
|
- make
|
||||||
- sudo make install
|
- sudo make install
|
||||||
|
- sudo ldconfig
|
||||||
- cd test/unit
|
- cd test/unit
|
||||||
- ../../bin/unit
|
- ../../bin/unit
|
||||||
- cd ../regression
|
- cd ../regression
|
||||||
|
|
|
@ -262,6 +262,5 @@ def run_test():
|
||||||
# -------------------------------------------------------------------------------
|
# -------------------------------------------------------------------------------
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
run_test()
|
run_test()
|
||||||
input("Press any key to continue ...")
|
|
||||||
|
|
||||||
# vim: ai ts=4 sts=4 et sw=4
|
# vim: ai ts=4 sts=4 et sw=4
|
||||||
|
|
Loading…
Reference in New Issue