mirror of
https://github.com/QuantumPackage/qp2.git
synced 2024-09-01 13:43:40 +02:00
Make qp take into account all LIB files of modules
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
This commit is contained in:
parent
f8b7ad5516
commit
cc0f226979
@ -103,14 +103,15 @@ def ninja_create_env_variable(pwd_config_file):
|
||||
for flag in ["FC", "FCFLAGS", "IRPF90", "IRPF90_FLAGS"]:
|
||||
str_ = "{0} = {1}".format(flag, get_compilation_option(pwd_config_file,
|
||||
flag))
|
||||
includefile = flag
|
||||
try:
|
||||
content = ""
|
||||
with open(includefile,'r') as f:
|
||||
content = f.read()
|
||||
str_ += " "+content
|
||||
except IOError:
|
||||
pass
|
||||
for directory in [real_join(QP_SRC, m) for m in sorted(os.listdir(QP_SRC))]:
|
||||
includefile = real_join(directory, flag)
|
||||
try:
|
||||
content = ""
|
||||
with open(includefile,'r') as f:
|
||||
content = f.read()
|
||||
str_ += " "+content
|
||||
except IOError:
|
||||
pass
|
||||
|
||||
l_string.append(str_)
|
||||
|
||||
@ -120,14 +121,15 @@ def ninja_create_env_variable(pwd_config_file):
|
||||
str_lib = " ".join([lib_lapack, EZFIO_LIB, ZMQ_LIB, LIB, lib_usr])
|
||||
|
||||
# Read all LIB files in modules
|
||||
libfile = "LIB"
|
||||
try:
|
||||
content = ""
|
||||
with open(libfile,'r') as f:
|
||||
content = f.read()
|
||||
str_lib += " "+content
|
||||
except IOError:
|
||||
pass
|
||||
for directory in [real_join(QP_SRC, m) for m in sorted(os.listdir(QP_SRC))]:
|
||||
libfile = real_join(directory, "LIB")
|
||||
try:
|
||||
content = ""
|
||||
with open(libfile,'r') as f:
|
||||
content = f.read()
|
||||
str_lib += " "+content
|
||||
except IOError:
|
||||
pass
|
||||
|
||||
l_string.append("LIB = {0} ".format(str_lib))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user