diff options
| author | andrew-elder <aelder@audioscience.com> | 2017-09-12 14:43:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 14:43:24 -0400 |
| commit | bffc91619ffff1990d81e7326d7d5879a705f523 (patch) | |
| tree | ae1cdb94d61849679b8dec62ab7d1b24304f194a | |
| parent | 63d7db3e1f5347f09de8527db337aba1d7567b08 (diff) | |
| parent | 100af70d13715791fa4e999f206f04a7c91069f6 (diff) | |
| download | Open-AVB-bffc91619ffff1990d81e7326d7d5879a705f523.tar.gz | |
Merge pull request #689 from audioscience/feature-appveyor
Feature appveyor
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rw-r--r-- | CMakeLists.txt | 1 |
2 files changed, 14 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 8eb91588..a8749dac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,12 +21,23 @@ before_install: - sudo update-alternatives --set c++ /usr/bin/g++ compiler: - gcc -env: BUILD_KERNEL=4.4.0-75-generic +env: + - BUILD_KERNEL=4.4.0-75-generic + - DEPS_DIR=${TRAVIS_BUILD_DIR}/deps install: - sudo apt-get update -qq - - sudo apt-get install -y libpcap-dev libpci-dev libsndfile1-dev libjack-dev linux-headers-4.4.0-75-generic cmake + - sudo apt-get install -y libpcap-dev libpci-dev libsndfile1-dev libjack-dev linux-headers-4.4.0-75-generic - sudo apt-get install -y libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev libasound2-dev - sudo cp /usr/src/linux-headers-4.4.0-75/include/uapi/linux/ethtool.h /usr/include/linux - sudo cp /usr/src/linux-headers-4.4.0-75/include/uapi/linux/ptp_clock.h /usr/include/linux + - | + if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then + CMAKE_URL="http://www.cmake.org/files/v3.4/cmake-3.4.3-Linux-x86_64.tar.gz" + mkdir -p ${DEPS_DIR}/cmake + travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${DEPS_DIR}/cmake + export PATH=${DEPS_DIR}/cmake/bin:${PATH} + fi + + script: ./travis.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 555d9db3..a9244229 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,3 +7,4 @@ add_subdirectory("thirdparty/cpputest") add_subdirectory("daemons/common/tests") add_subdirectory("daemons/mrpd") add_subdirectory("daemons/maap") +add_subdirectory("daemons/gptp") |