Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #672 from mossmann/clang-fix

Browse Source 
Fix OSX travis builds
This commit is contained in:
Michael Ossmann
2019-12-17 15:39:52 -07:00
committed by GitHub
parent e9c6c2d2e6 dcb98f7f51
commit 06eb9192cd
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -9,6 +9,7 @@ matrix:
- os: osx - os: osx
compiler: clang compiler: clang
osx_image: xcode10.3
env: env:
global: global:
@ -30,10 +31,10 @@ addons:
- python-yaml - python-yaml
homebrew: homebrew:
taps: PX4/homebrew-px4 taps: armmbed/formulae
packages: packages:
- fftw - fftw
- gcc-arm-none-eabi - arm-none-eabi-gcc
- dfu-util - dfu-util
before_install: before_install:

3
host/hackrf-tools/src/CMakeLists.txt
View File

@ -24,7 +24,8 @@
set(INSTALL_DEFAULT_BINDIR "bin" CACHE STRING "Appended to CMAKE_INSTALL_PREFIX") set(INSTALL_DEFAULT_BINDIR "bin" CACHE STRING "Appended to CMAKE_INSTALL_PREFIX")
find_package(FFTW REQUIRED) find_package(FFTW REQUIRED)
include_directories(${FFTW_INCLUDE_DIRS}) include_directories(${FFTW_INCLUDES})
get_filename_component(FFTW_LIBRARY_DIRS ${FFTW_LIBRARIES} DIRECTORY)
link_directories(${FFTW_LIBRARY_DIRS}) link_directories(${FFTW_LIBRARY_DIRS})
SET(TOOLS SET(TOOLS