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

Merge pull request #43 from scemama/master

Browse Source 
Building corrected
This commit is contained in:
Anthony Scemama 2015-03-27 09:34:49 +01:00
commit 71c7f14cbb
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -2,7 +2,7 @@ BLUE=
BLACK=(B BLACK=(B
.PHONY: doc src curl m4 ocaml irpf90 emsl build binary .PHONY: doc src ocaml build binary
default: default:
@echo ----------------------------------------------- @echo -----------------------------------------------
@ -26,16 +26,11 @@ build:
@echo source quantum_package.rc @echo source quantum_package.rc
@echo ----------------------------------------------- @echo -----------------------------------------------
else else
build: EZFIO curl m4 irpf90 emsl build:
$(MAKE) -C src $(MAKE) -C src
$(MAKE) -C ocaml $(MAKE) -C ocaml
endif endif
curl: bin/curl
m4: bin/m4
irpf90: bin/irpf90
emsl: EMSL_Basis
binary: binary:
$(QPACKAGE_ROOT)/scripts/make_binary.sh $(QPACKAGE_ROOT)/scripts/make_binary.sh

17
setup_environment.sh
View File

@ -11,23 +11,6 @@ BLACK="(B"
QPACKAGE_ROOT="$( cd "$(dirname "$BASH_SOURCE")" ; pwd -P )" QPACKAGE_ROOT="$( cd "$(dirname "$BASH_SOURCE")" ; pwd -P )"
if [[ -z "${IRPF90}" ]] ;
then
make irpf90
IRPF90="${QPACKAGE_ROOT}"/bin/irpf90
if [[ ! -x "${IRPF90}" ]]
then
echo $RED "Error in IRPF90 installation" $BLACK
exit 1
fi
fi
if [[ -z ${OCAMLBREW_BASE} ]]
then
export OCAMLBREW_BASE="$HOME/ocamlbrew"
fi
cat << EOF > quantum_package.rc cat << EOF > quantum_package.rc
export IRPF90="${IRPF90}" export IRPF90="${IRPF90}"
export QPACKAGE_ROOT=\$( cd \$(dirname "\${BASH_SOURCE}") ; pwd -P ) export QPACKAGE_ROOT=\$( cd \$(dirname "\${BASH_SOURCE}") ; pwd -P )