Skip to content

Commit

Permalink
BigMac support for AppleClang (#33)
Browse files Browse the repository at this point in the history
* set macOS FFTW flags
* fixed gitignore bug
* added NFFT fix
* updated fftw and nfft builds
* updated travis
* added Dockerfile and updated readme
* added build for mr2d1d_stat
* cleaned up CMakeLists
* changed lib order
* updated .gitignore
* added nfft fix for linux
* set macOS FFTW flags
* added build for mr2d1d_stat
* added new libraries
* updated fftw build instructions
* resolved issue with FFTW headers
* fixed library def
  • Loading branch information
sfarrens authored Sep 14, 2020
1 parent 3e3a6c6 commit f9e8952
Show file tree
Hide file tree
Showing 30 changed files with 3,210 additions and 418 deletions.
37 changes: 35 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,35 @@
# Ignore build files
*build*
# Prerequisites
*.d

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

# Ignore build directory
build
75 changes: 41 additions & 34 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,55 +1,62 @@
# System Set-Up
language: cpp

# install dependencies
addons:
apt:
packages:
- cmake
- libcfitsio3-dev
homebrew:
packages: &macos_packages
- cmake
- pkgconfig
- cfitsio
update: true
branches:
only:
- master

matrix:
jobs:
include:
- os: linux
dist: focal
compiler: gcc
name: "Ubuntu Focal"
env:
- CC=gcc-9
- CXX=g++-9
addons:
apt:
sources:
- sourceline: 'ppa:ubuntu-toolchain-r/test'
packages:
- gcc-9
- g++-9
- cmake
- libcfitsio-dev
- os: osx
name: "macOS with GCC"
osx_image: xcode11.3
osx_image: xcode12
language: shell
name: "macOS 10.15 GCC"
env:
- MATRIX_EVAL="CC=gcc-9 && CXX=g++-9"
- CC=gcc-9
- CXX=g++-9
addons:
homebrew:
packages:
- gcc
- *macos_packages
- cmake
- cfitsio
- gcc@9
update: true
- os: osx
name: "macOS with AppleClang"
osx_image: xcode11.3
osx_image: xcode12
language: shell
name: "macOS 10.15 AppleClang"
addons:
homebrew:
taps: sfarrens/sf
packages:
- libomp
- *macos_packages
- cmake
- cfitsio
- bigmac
update: true

before_install:
- eval "${MATRIX_EVAL}"

# set up installation
install:
- mkdir build
- cd build
- cmake .. -DRUN_TESTS=OFF

# build package and install
script:
- make install
# - make test
install:
- cmake .. -DBUILD_MSVST=ON
- make

# notification settings
notification:
email: false
script:
- make test
Loading

0 comments on commit f9e8952

Please sign in to comment.