Skip to content

Commit

Permalink
Merge pull request #40 from RuhiRG/fixupcpp
Browse files Browse the repository at this point in the history
BLD: Work on MacOS, use as a subproject
  • Loading branch information
HaoZeke authored Aug 23, 2023
2 parents b00eafa + 912873b commit 559311d
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# The project is seams-core, the executable is yodaStruct
project('seams-core', 'cpp',
version : '1.0.1',
default_options : ['warning_level=3', 'cpp_std=c++17'])
default_options : ['warning_level=3', 'cpp_std=c++14'])

host_system = host_machine.system()

Expand All @@ -33,7 +33,7 @@ if host_system == 'darwin'
# Workaround for
# error: aligned allocation function of
# type 'void *(unsigned long, enum std::align_val_t)' is only available on macOS 10.13 or newer
add_global_arguments(['-faligned-allocation', '-ggdb', '-Og', '-fno-inline-functions'], language: 'cpp')
add_project_arguments(['-faligned-allocation', '-ggdb', '-Og', '-fno-inline-functions'], language: 'cpp')
endif

cppc = meson.get_compiler('cpp')
Expand All @@ -52,7 +52,7 @@ eigen_dep = dependency('eigen3',
_deps += [ eigen_dep ]

fmt_dep = dependency('fmt',
version: '9.0.0',
version: '9.1.0',
required: true)
_deps += [ fmt_dep ]

Expand Down Expand Up @@ -108,6 +108,12 @@ ydslib = library('yodaLib',
include_directories : _incdirs,
install: true
)
yds_dep = declare_dependency(
link_with: [ydslib, _linkto],
include_directories: _incdirs,
compile_args: _args,
dependencies: _deps)


# -------------------- Executable

Expand Down

0 comments on commit 559311d

Please sign in to comment.