mirror of
https://github.com/QuantumPackage/qp2.git
synced 2024-12-23 04:43:45 +01:00
Update configure
This commit is contained in:
parent
1273c19897
commit
a8ab439a92
9
configure
vendored
9
configure
vendored
@ -199,7 +199,7 @@ if [[ "${PACKAGES}.x" != ".x" ]] ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ${PACKAGES} = all ]] ; then
|
if [[ ${PACKAGES} = all ]] ; then
|
||||||
PACKAGES="zlib ninja zeromq f77zmq gmp ocaml docopt resultsFile bats bse"
|
PACKAGES="zlib ninja zeromq f77zmq gmp ocaml docopt resultsFile bats"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@ -209,7 +209,8 @@ for PACKAGE in ${PACKAGES} ; do
|
|||||||
|
|
||||||
execute << EOF
|
execute << EOF
|
||||||
rm -f "\${QP_ROOT}"/bin/ninja
|
rm -f "\${QP_ROOT}"/bin/ninja
|
||||||
unzip "\${QP_ROOT}"/external/qp2-dependencies/ninja-linux.zip -d "\${QP_ROOT}"/bin
|
tar -zxvf "\${QP_ROOT}"/external/qp2-dependencies/ninja.tar.gz
|
||||||
|
mv ninja "\${QP_ROOT}"/bin/
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
||||||
@ -299,8 +300,8 @@ EOF
|
|||||||
|
|
||||||
execute << EOF
|
execute << EOF
|
||||||
cd "\${QP_ROOT}"/external
|
cd "\${QP_ROOT}"/external
|
||||||
tar -zxf qp2-dependencies/bats-v1.7.0.tar.gz
|
tar -zxf qp2-dependencies/bats-v1.1.0.tar.gz
|
||||||
( cd bats-core-1.7.0/ ; ./install.sh \${QP_ROOT})
|
( cd bats-core-1.1.0/ ; ./install.sh \${QP_ROOT})
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
else
|
else
|
||||||
|
2
external/qp2-dependencies
vendored
2
external/qp2-dependencies
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 242151e03d1d6bf042387226431d82d35845686a
|
Subproject commit 9e5b27ce5a174901765cec9db9e7b2aa6170a5de
|
Loading…
Reference in New Issue
Block a user