From 9019c61bb447f13c3d9c1234b6cc2bd61f1537a5 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pauli.t.virtanen@jyu.fi>
Date: Tue, 16 Aug 2022 15:15:26 +0300
Subject: [PATCH] Cleanup build
---
meson.build | 12 ++++--------
usadelndsoc/meson.build | 2 ++
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/meson.build b/meson.build
index 8739f6f..5c43a98 100644
--- a/meson.build
+++ b/meson.build
@@ -5,14 +5,12 @@ project('usadelndsoc', ['cpp', 'fortran'],
cppad_dep = dependency('cppad')
eigen3_dep = dependency('eigen3')
-adolc_dep = dependency('adolc')
py_mod = import('python')
py3 = py_mod.find_installation('python3')
py3_dep = py3.dependency()
cpp = meson.get_compiler('cpp')
-adept_dep = cpp.find_library('adept', has_headers : ['adept.h'])
incdir_numpy = run_command(py3,
[
@@ -22,12 +20,10 @@ incdir_numpy = run_command(py3,
check: true
).stdout().strip()
cc = meson.get_compiler('cpp')
-npymath_path = incdir_numpy / '..' / 'lib'
-npymath_lib_dep = cc.find_library('npymath', dirs: npymath_path)
numpy_dep = declare_dependency(
compile_args : ['-DNPY_NO_DEPRECATED_API=NPY_1_9_API_VERSION'],
include_directories : [include_directories(incdir_numpy)],
- dependencies : [py3_dep, npymath_lib_dep],
+ dependencies : [py3_dep],
)
incdir_pybind11 = run_command(py3,
@@ -42,9 +38,9 @@ pybind11_dep = declare_dependency(
include_directories : [include_directories(incdir_pybind11)],
dependencies : [py3_dep]
)
-deps = [cppad_dep, eigen3_dep, adept_dep, adolc_dep]
-#executable('main', ['src/main.cpp'], dependencies : deps)
+deps = [cppad_dep, eigen3_dep]
-executable('main2', ['src/xtest.f95', 'src/adjac/adjac.f95'])
+#executable('main', ['src/main.cpp'], dependencies : deps)
+#executable('main2', ['src/xtest.f95', 'src/adjac/adjac.f95'])
subdir('usadelndsoc')
diff --git a/usadelndsoc/meson.build b/usadelndsoc/meson.build
index c596e99..3c16673 100644
--- a/usadelndsoc/meson.build
+++ b/usadelndsoc/meson.build
@@ -4,9 +4,11 @@ py3.extension_module(
dependencies : deps + [numpy_dep, py3_dep, pybind11_dep],
install : true,
subdir : 'usadelndsoc',
+ link_language: 'fortran',
)
py3.install_sources(
['__init__.py', 'matsubara.py'],
+ pure: false,
subdir : 'usadelndsoc',
)
--
GitLab