Skip to content
Snippets Groups Projects
Commit 5c94c8cc authored by Andreas Dedner's avatar Andreas Dedner
Browse files

In setup-dunepy switch order of call to make install_python and generating dune-py.

Now first install then generate dune-py so that .nocinfigure tag file is not removed due to call to
install_python
parent 3c515ffe
No related branches found
No related tags found
No related merge requests found
......@@ -98,6 +98,18 @@ def main(argv):
deps = resolve_order(deps)
deps += [masterModule]
if execute == "install":
for m in deps:
moddir = duneModules[1][m]
pythonModule = toBuildDir(builddir,moddir,m)
print("calling install_python for %s (%s)" % (m,pythonModule))
try:
command = ['cmake', '--build', '.', '--target', 'install_python']
proc = subprocess.Popen(command, cwd=pythonModule, stdout = subprocess.PIPE)
stdout, stderr = proc.communicate()
logger.debug(buffer_to_str(stdout))
except FileNotFoundError:
print("Warning: build dir not found possibly module is installed then python bindings should be already available")
dunepy = get_dune_py_dir()
dunepyBase = os.path.realpath( os.path.join(dunepy,"..") )
......@@ -113,18 +125,5 @@ def main(argv):
print("CMake output")
print(output)
if execute == "install":
for m in deps:
moddir = duneModules[1][m]
pythonModule = toBuildDir(builddir,moddir,m)
print("calling install_python for %s (%s)" % (m,pythonModule))
try:
command = ['cmake', '--build', '.', '--target', 'install_python']
proc = subprocess.Popen(command, cwd=pythonModule, stdout = subprocess.PIPE)
stdout, stderr = proc.communicate()
logger.debug(buffer_to_str(stdout))
except FileNotFoundError:
print("Warning: build dir not found possibly module is installed then python bindings should be already available")
if __name__ == "__main__":
main(sys.argv[1:])
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment