Commit 47583276 authored by Daniel Wortmann's avatar Daniel Wortmann

Some small bugfixes in configure script

parent 869a13a2
FC=mpiifort
FLEUR_LIBRARIES="-lxml2;-lmkl_scalapack_lp64;-lmkl_blacs_intelmpi_lp64;-mt_mpi"
FC=${FC:=mpiifort}
FLEUR_LIBRARIES="-lxml2;-lmkl_scalapack_lp64;-lmkl_blacs_intelmpi_lp64;-mt_mpi;${FLEUR_LIBRARIES}"
......@@ -16,7 +16,7 @@ if [ "$CLI_LIBRARIES" ]
then
if [ "cmake_lib" ]
then
cmake_lib="$CLI_LIBRARIES:$cmake_lib"
cmake_lib="$CLI_LIBRARIES;$cmake_lib"
else
cmake_lib="$CLI_LIBRARIES"
fi
......@@ -26,7 +26,7 @@ for lib in $FLEUR_LIBDIR $CLI_LIBDIR
do
if [ "cmake_lib" ]
then
cmake_lib="-L$lib:$cmake_lib"
cmake_lib="-L$lib;$cmake_lib"
else
cmake_lib="-L$lib"
fi
......@@ -45,11 +45,11 @@ then
fi
if [ "$CLI_FLAGS" ]
then
cmake_flags="$CMAKE_Fortran_FLAGS cmake_flags"
cmake_flags="$CMAKE_Fortran_FLAGS $cmake_flags"
fi
for lib in $FLEUR_INCLUDEDIR $CLI_INCLUDEDIR
do
cmake_flags="-I$lib cmake_flags"
cmake_flags="-I$lib $cmake_flags"
done
echo "set(CMAKE_Fortran_FLAGS \"$cmake_flags\")" >>config.cmake
......
......@@ -12,7 +12,10 @@ then
#Do make install
cd build
make install
cd ..
else
cd CMake-hdf5-${hdf5_version}
fi
#Store the installation location
FLEUR_LIBDIR="$PWD/HDF5/$hdf_version/lib $FLEUR_LIBDIR"
FLEUR_INCLUDEDIR="$PWD/HDF5/$hdf_version/include/static $FLEUR_INCLUDEDIR"
FLEUR_LIBDIR="$PWD/HDF_Group/HDF5/${hdf5_version}/lib $FLEUR_LIBDIR"
FLEUR_INCLUDEDIR="$PWD/HDF_Group/HDF5/${hdf5_version}/include/static $FLEUR_INCLUDEDIR"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment