Commit 5d520562 authored by Ondrej Vysocky's avatar Ondrej Vysocky
Browse files

ENH MERIC wscript according its last version

parent 7a4a7b66
......@@ -14,6 +14,8 @@ def configure(ctx):
# ctx.env.append_unique("CXXFLAGS", [ "-qopenmp" ]) #Intel
# ctx.env.append_unique("DEFINES", [ "HAVE_OMP_H" ]) #with openMP
ctx.env.append_unique("DEFINES", [ "JETSONMEASUREMENTPATH=\""+ctx.path.abspath()+"/tools\""])
if ctx.options.debug:
ctx.env.append_unique("DEFINES", [ "__MERIC_DEBUG__" ])
if ctx.options.verbose:
......@@ -32,12 +34,12 @@ def configure(ctx):
# ctx.env.append_unique("DEFINES", [ "HAVE_LINUX_PERF_EVENT_H" ]) #if problem with searching
# ctx.env.append_unique("DEFINES", [ "HAVE_X86_ADAPT_H" ]) #if problem with searching
ctx.find_program(ctx.options.mpi, var="MPICXX", mandatory=False)
if ctx.env.MPICXX:
ctx.setenv("mpi", ctx.env.derive())
ctx.env.CXX = list(ctx.env.MPICXX)
ctx.env.LINK_CXX = ctx.env.CXX
ctx.env.append_unique("DEFINES", [ "HAVE_MPI_H" ])
ctx.msg("Compiler flags", " ".join(ctx.env["CXXFLAGS"]))
......@@ -72,6 +74,8 @@ def build(ctx):
if not ctx.env.MPICXX:
return
ctx.all_envs["mpi"].LINK_CXX = ctx.all_envs["mpi"].CXX
ctx.stlib(
source = ctx.path.ant_glob('src/meric/distributed/*.cpp'),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment