File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed
prerequisites/install-functions Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ build_opencoarrays()
7
7
find_or_install mpich
8
8
info " Invoking find_or_install cmake"
9
9
find_or_install cmake
10
- build_path=" ${build_path} " /opencoarrays/$( " ${opencoarrays_src_dir } " /install.sh -V opencoarrays)
10
+ build_path=" ${build_path} " /opencoarrays/$( " ${OPENCOARRAYS_SRC_DIR } " /install.sh -V opencoarrays)
11
11
if [[ -d " ${build_path} " ]]; then
12
12
rm -rf " ${build_path} "
13
13
fi
@@ -44,8 +44,8 @@ build_opencoarrays()
44
44
set_or_print_installation_path
45
45
46
46
info " Configuring OpenCoarrays in ${PWD} with the command:"
47
- info " CC=\" ${CC} \" FC=\" ${FC} \" $CMAKE \" ${opencoarrays_src_dir } \" \" ${WDEVFLAG} \" -DCMAKE_INSTALL_PREFIX=\" ${install_path} \" -DMPIEXEC=\" ${MPIEXEC} \" -DMPI_C_COMPILER=\" ${MPICC} \" -DMPI_Fortran_COMPILER=\" ${MPIFC} \" "
48
- CC=" ${CC} " FC=" ${FC} " $CMAKE " ${opencoarrays_src_dir } " " ${WDEVFLAG} " -DCMAKE_INSTALL_PREFIX=" ${install_path} " -DMPIEXEC=" ${MPIEXEC} " -DMPI_C_COMPILER=" ${MPICC} " -DMPI_Fortran_COMPILER=" ${MPIFC} "
47
+ info " CC=\" ${CC} \" FC=\" ${FC} \" $CMAKE \" ${OPENCOARRAYS_SRC_DIR } \" \" ${WDEVFLAG} \" -DCMAKE_INSTALL_PREFIX=\" ${install_path} \" -DMPIEXEC=\" ${MPIEXEC} \" -DMPI_C_COMPILER=\" ${MPICC} \" -DMPI_Fortran_COMPILER=\" ${MPIFC} \" "
48
+ CC=" ${CC} " FC=" ${FC} " $CMAKE " ${OPENCOARRAYS_SRC_DIR } " " ${WDEVFLAG} " -DCMAKE_INSTALL_PREFIX=" ${install_path} " -DMPIEXEC=" ${MPIEXEC} " -DMPI_C_COMPILER=" ${MPICC} " -DMPI_Fortran_COMPILER=" ${MPIFC} "
49
49
info " Building OpenCoarrays in ${PWD} with the command make -j${num_threads} "
50
50
make " -j${num_threads} "
51
51
if [[ ! -z ${SUDO:- } ]]; then
Original file line number Diff line number Diff line change @@ -34,10 +34,10 @@ report_results()
34
34
# Prepend the OpenCoarrays license to the setup.sh script:
35
35
while IFS=' ' read -r line || [[ -n " ${line} " ]]; do
36
36
echo " # ${line} " >> setup.sh
37
- done < " ${OpenCoarrays_src_dir } /LICENSE"
37
+ done < " ${OPENCOARRAYS_SRC_DIR } /LICENSE"
38
38
while IFS=' ' read -r line || [[ -n " ${line} " ]]; do
39
39
echo " # ${line} " >> setup.csh
40
- done < " ${opencoarrays_src_dir } /LICENSE"
40
+ done < " ${OPENCOARRAYS_SRC_DIR } /LICENSE"
41
41
echo " # " | tee -a setup.csh setup.sh
42
42
echo " # Execute this script via the following command: " | tee -a setup.csh setup.sh
43
43
echo " # source ${install_path%/ } /setup.sh " | tee -a setup.csh setup.sh
You can’t perform that action at this time.
0 commit comments