LCPQ/quantum_package
10
0
Fork 0
mirror of https://github.com/LCPQ/quantum_package synced 2024-12-23 12:56:14 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Anthony Scemama 2016-12-05 09:40:42 +01:00
commit e6c8cf2e25
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -70,7 +70,6 @@ d_dependency = {
"resultsFile": ["python"], "resultsFile": ["python"],
"emsl": ["python"], "emsl": ["python"],
"gcc": [], "gcc": [],
"gmp": [ "gcc", "make" ],
"g++": [], "g++": [],
"zeromq" : [ "g++", "make" ], "zeromq" : [ "g++", "make" ],
"f77zmq" : [ "zeromq", "python", "make" ], "f77zmq" : [ "zeromq", "python", "make" ],
@ -132,11 +131,6 @@ ninja = Info(
description=' ninja', description=' ninja',
default_path=join(QP_ROOT_BIN, "ninja")) default_path=join(QP_ROOT_BIN, "ninja"))
gmp = Info(
url='https://gmplib.org/download/gmp/gmp-6.1.1.tar.bz2',
description=' GMP library',
default_path=join(QP_ROOT_LIB, "libgmp.so"))
emsl = Info( emsl = Info(
url='{head}/LCPQ/EMSL_Basis_Set_Exchange_Local/{tail}'.format(**path_github), url='{head}/LCPQ/EMSL_Basis_Set_Exchange_Local/{tail}'.format(**path_github),
description=' EMSL basis set library', description=' EMSL basis set library',
@ -156,7 +150,6 @@ f77zmq = Info(
url='{head}/zeromq/f77_zmq/{tail}'.format(**path_github), url='{head}/zeromq/f77_zmq/{tail}'.format(**path_github),
description=' F77-ZeroMQ', description=' F77-ZeroMQ',
default_path=join(QP_ROOT_LIB, "libf77zmq.a") ) default_path=join(QP_ROOT_LIB, "libf77zmq.a") )
# join(QP_ROOT, "src", "ZMQ", "f77zmq.h") )
p_graphviz = Info( p_graphviz = Info(
url='https://github.com/xflr6/graphviz/archive/master.tar.gz', url='https://github.com/xflr6/graphviz/archive/master.tar.gz',
@ -172,7 +165,7 @@ d_info = dict()
for m in ["ocaml", "m4", "curl", "zlib", "patch", "irpf90", "docopt", for m in ["ocaml", "m4", "curl", "zlib", "patch", "irpf90", "docopt",
"resultsFile", "ninja", "emsl", "ezfio", "p_graphviz", "resultsFile", "ninja", "emsl", "ezfio", "p_graphviz",
"zeromq", "f77zmq","bats", "gmp" ]: "zeromq", "f77zmq","bats"]:
exec ("d_info['{0}']={0}".format(m)) exec ("d_info['{0}']={0}".format(m))

2
install/scripts/install_ocaml.sh
View File

@ -5,7 +5,7 @@ QP_ROOT=$PWD
cd - cd -
# Normal installation # Normal installation
PACKAGES="core cryptokit zarith ocamlfind sexplib ZMQ" PACKAGES="core cryptokit.1.10 ocamlfind sexplib ZMQ"
#ppx_sexp_conv #ppx_sexp_conv
# Needed for ZeroMQ # Needed for ZeroMQ