diff options
| author | Daniel Agar <daniel@agar.ca> | 2015-01-02 22:47:10 -0500 |
|---|---|---|
| committer | Daniel Agar <daniel@agar.ca> | 2015-01-02 23:58:52 -0500 |
| commit | cd381161164eb4f3bd30764f1b62a1e39b8db39f (patch) | |
| tree | 1d44179c0a0813ba18fb029fa217bbed0eb5d955 | |
| parent | c520119129c8815c3d79299917154bcec7a58707 (diff) | |
| download | px4-firmware-cd381161164eb4f3bd30764f1b62a1e39b8db39f.tar.gz px4-firmware-cd381161164eb4f3bd30764f1b62a1e39b8db39f.tar.bz2 px4-firmware-cd381161164eb4f3bd30764f1b62a1e39b8db39f.zip | |
add cmake to travis
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | unittests/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index e7dc6029c..02882ac96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_script: # General toolchain dependencies - sudo apt-get install libc6:i386 libgcc1:i386 gcc-4.6-base:i386 libstdc++5:i386 libstdc++6:i386 - sudo apt-get install python-serial python-argparse - - sudo apt-get install flex bison libncurses5-dev autoconf texinfo build-essential libtool zlib1g-dev genromfs git wget + - sudo apt-get install flex bison libncurses5-dev autoconf texinfo build-essential libtool zlib1g-dev genromfs git wget cmake - pushd . - cd ~ - wget https://launchpadlibrarian.net/174121628/gcc-arm-none-eabi-4_7-2014q2-20140408-linux.tar.bz2 diff --git a/unittests/Makefile b/unittests/Makefile index e9453cedd..5faa50bb5 100644 --- a/unittests/Makefile +++ b/unittests/Makefile @@ -80,7 +80,7 @@ st24_test: $(ST24_FILES) cmake_gtests: mkdir -p build - cd build && cmake .. && $(MAKE) && $(MAKE) test + cd build && CC=gcc cmake .. && $(MAKE) && $(MAKE) test unittests: clean mixer_test sbus2_test sf0x_test st24_test cmake_gtests ./mixer_test |