comp-chem/cp2k
1
0
Fork 0
mirror of https://github.com/cp2k/cp2k.git synced 2026-07-29 06:35:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid double slashes in path names

Browse source 
It seems cmake is still not resilient concerning multiple slashes in path names
This commit is contained in:
Matthias Krack 2023-02-28 13:48:34 +01:00
parent c971ca6876
commit c61313dab1
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tools/toolchain/scripts/stage1/install_intelmpi.sh
View file

@ -29,15 +29,15 @@ case "${with_intelmpi}" in
;;
__SYSTEM__)
echo "==================== Finding Intel MPI from system paths ===================="
check_command mpiexec "intelmpi" && MPIRUN="$(command -v mpiexec)" || exit 1
check_command mpiexec "intelmpi" && MPIRUN="$(realpath $(command -v mpiexec))" || exit 1
if [ "${with_intel}" != "__DONTUSE__" ]; then
check_command mpiicc "intelmpi" && MPICC="$(command -v mpiicc)" || exit 1
check_command mpiicpc "intelmpi" && MPICXX="$(command -v mpiicpc)" || exit 1
check_command mpiifort "intelmpi" && MPIFC="$(command -v mpiifort)" || exit 1
check_command mpiicc "intelmpi" && MPICC="$(realpath $(command -v mpiicc))" || exit 1
check_command mpiicpc "intelmpi" && MPICXX="$(realpath $(command -v mpiicpc))" || exit 1
check_command mpiifort "intelmpi" && MPIFC="$(realpath $(command -v mpiifort))" || exit 1
else
check_command mpicc "intelmpi" && MPICC="$(command -v mpicc)" || exit 1
check_command mpicxx "intelmpi" && MPICXX="$(command -v mpicxx)" || exit 1
check_command mpifort "intelmpi" && MPIFC="$(command -v mpifort)" || exit 1
check_command mpicc "intelmpi" && MPICC="$(realpath $(command -v mpicc))" || exit 1
check_command mpicxx "intelmpi" && MPICXX="$(realpath $(command -v mpicxx))" || exit 1
check_command mpifort "intelmpi" && MPIFC="$(realpath $(command -v mpifort))" || exit 1
fi
MPIFORT="${MPIFC}"
MPIF77="${MPIFC}"

2
tools/toolchain/scripts/tool_kit.sh
View file

@ -340,7 +340,7 @@ check_command() {
local __package=${2}
fi
if $(command -v ${__command} > /dev/null 2>&1); then
echo "path to ${__command} is $(command -v ${__command})"
echo "path to ${__command} is $(realpath $(command -v ${__command}))"
else
report_error "Cannot find ${__command}, please check if the package ${__package} is installed or in system search path"
return 1