Merge pull request #672 from mossmann/clang-fix

Fix OSX travis builds
This commit is contained in:
Michael Ossmann
2019-12-17 15:39:52 -07:00
committed by GitHub
2 changed files with 5 additions and 3 deletions

View File

@ -9,6 +9,7 @@ matrix:
- os: osx
compiler: clang
osx_image: xcode10.3
env:
global:
@ -30,10 +31,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:

View File

@ -24,7 +24,8 @@
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})
get_filename_component(FFTW_LIBRARY_DIRS ${FFTW_LIBRARIES} DIRECTORY)
link_directories(${FFTW_LIBRARY_DIRS})
SET(TOOLS