Skip to content

Commit f9e8952

Browse files
authored
BigMac support for AppleClang (#33)
* 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
1 parent 3e3a6c6 commit f9e8952

30 files changed

+3210
-418
lines changed

.gitignore

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,35 @@
1-
# Ignore build files
2-
*build*
1+
# Prerequisites
2+
*.d
3+
4+
# Compiled Object files
5+
*.slo
6+
*.lo
7+
*.o
8+
*.obj
9+
10+
# Precompiled Headers
11+
*.gch
12+
*.pch
13+
14+
# Compiled Dynamic libraries
15+
*.so
16+
*.dylib
17+
*.dll
18+
19+
# Fortran module files
20+
*.mod
21+
*.smod
22+
23+
# Compiled Static libraries
24+
*.lai
25+
*.la
26+
*.a
27+
*.lib
28+
29+
# Executables
30+
*.exe
31+
*.out
32+
*.app
33+
34+
# Ignore build directory
35+
build

.travis.yml

Lines changed: 41 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,62 @@
11
# System Set-Up
22
language: cpp
33

4-
# install dependencies
5-
addons:
6-
apt:
7-
packages:
8-
- cmake
9-
- libcfitsio3-dev
10-
homebrew:
11-
packages: &macos_packages
12-
- cmake
13-
- pkgconfig
14-
- cfitsio
15-
update: true
4+
branches:
5+
only:
6+
- master
167

17-
matrix:
8+
jobs:
189
include:
1910
- os: linux
11+
dist: focal
12+
compiler: gcc
13+
name: "Ubuntu Focal"
14+
env:
15+
- CC=gcc-9
16+
- CXX=g++-9
17+
addons:
18+
apt:
19+
sources:
20+
- sourceline: 'ppa:ubuntu-toolchain-r/test'
21+
packages:
22+
- gcc-9
23+
- g++-9
24+
- cmake
25+
- libcfitsio-dev
2026
- os: osx
21-
name: "macOS with GCC"
22-
osx_image: xcode11.3
27+
osx_image: xcode12
28+
language: shell
29+
name: "macOS 10.15 GCC"
2330
env:
24-
- MATRIX_EVAL="CC=gcc-9 && CXX=g++-9"
31+
- CC=gcc-9
32+
- CXX=g++-9
2533
addons:
2634
homebrew:
2735
packages:
28-
- gcc
29-
- *macos_packages
36+
- cmake
37+
- cfitsio
38+
- gcc@9
39+
update: true
3040
- os: osx
31-
name: "macOS with AppleClang"
32-
osx_image: xcode11.3
41+
osx_image: xcode12
42+
language: shell
43+
name: "macOS 10.15 AppleClang"
3344
addons:
3445
homebrew:
46+
taps: sfarrens/sf
3547
packages:
36-
- libomp
37-
- *macos_packages
48+
- cmake
49+
- cfitsio
50+
- bigmac
51+
update: true
3852

3953
before_install:
40-
- eval "${MATRIX_EVAL}"
41-
42-
# set up installation
43-
install:
4454
- mkdir build
4555
- cd build
46-
- cmake .. -DRUN_TESTS=OFF
4756

48-
# build package and install
49-
script:
50-
- make install
51-
# - make test
57+
install:
58+
- cmake .. -DBUILD_MSVST=ON
59+
- make
5260

53-
# notification settings
54-
notification:
55-
email: false
61+
script:
62+
- make test

0 commit comments

Comments
 (0)