From f80fe3d7d3894fadf2129f75a68331265bdc9ea1 Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Fri, 13 Dec 2019 18:10:24 +0000
Subject: [PATCH] remove broken meson.build lines
---
CHANGES | 2 ++
meson.build | 27 +++++++++++++++++++--------
tbse | 1 -
3 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/CHANGES b/CHANGES
index 11cd2b6ad..e54290dc7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,8 @@ Documentation updates (thanks to all, especially Nina and David).
The binary_grid Perl module has been marked as deprecated.
+Lots of minor bug fixes, and kludges to allow MacOSX build
+
V2.1.5
Updates to the meson build to make it more efficient and work on more platforms.
diff --git a/meson.build b/meson.build
index 7e676a23e..e979e2f89 100644
--- a/meson.build
+++ b/meson.build
@@ -672,17 +672,28 @@ run_command('meson/make_version_macros.pl')
# data objects
#
# list and build them
-message('Checking and building data objects')
-data_objects_compilation = run_command('meson/data_object_list_and_build.sh')
-if data_objects_compilation.returncode() != 0
- error('There was a problem building the data objects. Please check that you have objcopy installed, and try running meson/data_object_list_and_build.sh from the binary_c root directory manually to check for errors')
-endif
-data_objects = data_objects_compilation.stdout().strip().split(' ')
+if os != 'darwin'
+ message('Checking and building data objects')
+
+ data_objects_compilation = run_command('meson/data_object_list_and_build.sh')
-if get_option('clean_data_objects') == true
- run_command('meson/clean_data_objects.sh')
+ if data_objects_compilation.returncode() != 0
+ error('There was a problem building the data objects. Please check that you have objcopy installed, and try running meson/data_object_list_and_build.sh from the binary_c root directory manually to check for errors')
+ endif
+ data_objects = data_objects_compilation.stdout().strip().split(' ')
+
+ if get_option('clean_data_objects') == true
+ run_command('meson/clean_data_objects.sh')
+ endif
+else
+ data_objects = []
endif
+############################################################
+# data objects V2
+#
+
+
############################################################
# source files
#
diff --git a/tbse b/tbse
index 54dd004dd..0c302f085 100755
--- a/tbse
+++ b/tbse
@@ -2069,7 +2069,6 @@ $WARMUP \
--sn_kick_dispersion_BH_NS $SN_KICK_DISPERSION_BH_NS \
--sn_kick_dispersion_IA_Hybrid_HeCOWD $SN_KICK_DISPERSION_IA_Hybrid_HeCOWD \
--sn_kick_dispersion_IA_Hybrid_HeCOWD_subluminous $SN_KICK_DISPERSION_IA_Hybrid_HeCOWD_subluminous \
-\
--sn_kick_companion_IA_He $SN_KICK_COMPANION_IA_He \
--sn_kick_companion_IA_ELD $SN_KICK_COMPANION_IA_ELD \
--sn_kick_companion_IA_CHAND $SN_KICK_COMPANION_IA_CHAND \
--
GitLab