From 37c32abc374c3300e4116aa840a3e19dcafd9a9e Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Thu, 26 Sep 2019 00:17:30 -0600 Subject: [PATCH 1/4] use ARMmbed gcc --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7cee0156..1a238dca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,10 +30,10 @@ addons: - python-yaml homebrew: - taps: PX4/homebrew-px4 + taps: armmbed/formulae packages: - fftw - - gcc-arm-none-eabi + - arm-none-eabi-gcc - dfu-util before_install: From 74790c307647434397ec19e1b85efb5d73c33ec7 Mon Sep 17 00:00:00 2001 From: Mike Walters Date: Tue, 10 Dec 2019 16:33:29 +0000 Subject: [PATCH 2/4] travis: Use a newer OSX image --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1a238dca..20d536d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ matrix: - os: osx compiler: clang + osx_image: xcode10.3 env: global: From d9897e03b1e1cb1cebb47db507fdb745ac258523 Mon Sep 17 00:00:00 2001 From: Mike Walters Date: Tue, 10 Dec 2019 17:59:54 +0000 Subject: [PATCH 3/4] Fix FFTW include dir --- host/hackrf-tools/src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/hackrf-tools/src/CMakeLists.txt b/host/hackrf-tools/src/CMakeLists.txt index ee2dbb94..b2978670 100644 --- a/host/hackrf-tools/src/CMakeLists.txt +++ b/host/hackrf-tools/src/CMakeLists.txt @@ -24,7 +24,7 @@ set(INSTALL_DEFAULT_BINDIR "bin" CACHE STRING "Appended to CMAKE_INSTALL_PREFIX") find_package(FFTW REQUIRED) -include_directories(${FFTW_INCLUDE_DIRS}) +include_directories(${FFTW_INCLUDES}) link_directories(${FFTW_LIBRARY_DIRS}) SET(TOOLS From dcb98f7f51a192d6466a5146f1923e88a46fc564 Mon Sep 17 00:00:00 2001 From: Mike Walters Date: Tue, 10 Dec 2019 18:12:16 +0000 Subject: [PATCH 4/4] Get FFTW library dir --- host/hackrf-tools/src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/host/hackrf-tools/src/CMakeLists.txt b/host/hackrf-tools/src/CMakeLists.txt index b2978670..7115151c 100644 --- a/host/hackrf-tools/src/CMakeLists.txt +++ b/host/hackrf-tools/src/CMakeLists.txt @@ -25,6 +25,7 @@ set(INSTALL_DEFAULT_BINDIR "bin" CACHE STRING "Appended to CMAKE_INSTALL_PREFIX" find_package(FFTW REQUIRED) include_directories(${FFTW_INCLUDES}) +get_filename_component(FFTW_LIBRARY_DIRS ${FFTW_LIBRARIES} DIRECTORY) link_directories(${FFTW_LIBRARY_DIRS}) SET(TOOLS