From 99a6a41783601791b155d316ad1fef4a0bc7f1ed Mon Sep 17 00:00:00 2001 From: Evan Heller Date: Tue, 8 Aug 2017 15:06:06 -0400 Subject: [PATCH] Modifications to MANIFEST, SConstruct to make compiling and installing on macOS easier --- MANIFEST.in | 1 + SConstruct | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 9585d7c2..f71b1828 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -6,6 +6,7 @@ recursive-include storm_analysis *.mat recursive-include storm_analysis *.md recursive-include storm_analysis *.py recursive-include storm_analysis *.so +recursive-include storm_analysis *.dylib recursive-include storm_analysis *.txt recursive-include storm_analysis *.ui diff --git a/SConstruct b/SConstruct index 6e18caf8..8e31ff97 100644 --- a/SConstruct +++ b/SConstruct @@ -36,7 +36,17 @@ if (env['CC'] == "gcc"): # Library names and paths. fftw_lib = 'fftw3' fftw_lib_path = None -l1h_libs = ['lapack', 'rt'] + +# OS-X apparently does not have and doesn't need the rt library. +if (platform.system() == "Darwin"): + fftw_lib='libfftw3' + fftw_lib_path = '/usr/local/lib' + l1h_libs = ['lapack'] + env.Append(CCFLAGS='-I/usr/local/include') + env.Append(LDFLAGS='-L/usr/local/include') +else: + l1h_libs = ['lapack', 'rt'] + lapack_lib_path = None #