Commit 7e43fc23 authored by incardon's avatar incardon
Browse files

Fixing installation process

parent d92b2d61
......@@ -92,6 +92,12 @@ if [ ! -d src/config ]; then
fi
cd ..
cd openfpm_numerics
if [ ! -d src/config ]; then
mkdir src/config
fi
cd ..
# Create config directory
if [ ! -d src/config ]; then
......
#! /bin/bash
function detect_gfortran()
{
command -v $1 >/dev/null 2>&1
if [ $? -ne 0 ]; then
dgc_ret=0
return
fi
dgc_ret=1
}
......@@ -6,13 +6,14 @@ source script/discover_package_manager
source script/discover_os
source script/solve_autoconf
source script/solve_gpp
source script/solve_gfortran
source script/solve_cmake
source script/solve_git
source script/solve_wget
source script/solve_automake
source script/solve_brew
source script/solve_libtool
source script/solve_gfortran
source script/solve_fortran
source script/detect_gcc
source script/detect_osx
source script/show_solutions
......@@ -185,6 +186,7 @@ fi
detect_gcc_or_clang g++
if [ $dgc_ret -eq 0 ]; then
echo -e "g++ \033[91;5;1m FAILED \033[0m"
solve_gpp $platform
detect_gcc_or_clang $compiler_gpp
if [ $dgc_ret -eq 0 ]; then
......@@ -203,6 +205,7 @@ fi
detect_fortran gfortran
if [ $dgc_ret -eq 0 ]; then
echo -e "gfortran\033[91;5;1m FAILED \033[0m"
solve_gfortran $platform
detect_fortran $compiler_fortran
if [ $dgc_ret -eq 0 ]; then
......
......@@ -11,13 +11,13 @@ if [ x"$pcman" = x"" ]; then
fi
if [ x"$1" = x"osx" ]; then
commands[0]="$pcman install gfortran"
commands[0]="$pcman install gcc"
possible_solutions "${commands[@]}"
echo "Executing: ${command[$possible_solutions_ret]}"
eval ${commands[$possible_solutions_ret]}
elif [ x"$1" = x"linux" ]; then
commands[0]="su -c \"$pcman install cmake\""
commands[1]="sudo $pcman install cmake"
commands[0]="su -c \"$pcman install gfortran\""
commands[1]="sudo $pcman install gfortran"
possible_solutions "${commands[@]}"
echo "Executing: ${command[$possible_solutions_ret]}"
eval ${commands[$possible_solutions_ret]}
......
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