From 3e9c1876e832569364419abbb6f71e8fbec71c98 Mon Sep 17 00:00:00 2001 From: Andrew Elder Date: Mon, 5 Jun 2017 16:50:14 -0400 Subject: add gptp to cmake file list gPTP will get built twice in a Travis build test. Once from a makefile and again from cmake generated makefile. This change will support appveyor building gptp for windows as part of the standard sanity tests. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) 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") -- cgit v1.2.1 From 100af70d13715791fa4e999f206f04a7c91069f6 Mon Sep 17 00:00:00 2001 From: Andrew Elder Date: Tue, 20 Jun 2017 18:09:37 -0400 Subject: travis: use cmake 3.4 --- .travis.yml | 15 +++++++++++++-- 1 file changed, 13 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 -- cgit v1.2.1