diff --git a/install b/install index dcaf73ee292ffe4e1aaadcc7576bbc6386374f40..6bcb17830b7ea7db22b01423104e6dd10b1d2fab 100755 --- a/install +++ b/install @@ -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 diff --git a/script/detect_gfortran b/script/detect_fortran similarity index 64% rename from script/detect_gfortran rename to script/detect_fortran index 76ea2a667cefd420e9d6c93afdbb52825023b54b..9508e239911934413cb26a0cd4662395f3e7f152 100755 --- a/script/detect_gfortran +++ b/script/detect_fortran @@ -1,6 +1,6 @@ #! /bin/bash -function detect_gfortran() +function detect_fortran() { command -v $1 >/dev/null 2>&1 if [ $? -ne 0 ]; then @@ -8,6 +8,8 @@ function detect_gfortran() return fi + echo -e "$1 \033[92;1m SUCCESS \033[0m" + dgc_ret=1 } diff --git a/script/pre_req b/script/pre_req index 5d47e34631b2b6246224d33b0e53ca958a1dab61..6890a9ce97cf043dfb9f1b8eedb727323dff282d 100755 --- a/script/pre_req +++ b/script/pre_req @@ -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 diff --git a/script/solve_gfortran b/script/solve_gfortran old mode 100644 new mode 100755 index ab3fe353da3899399148abfd829c72e864b82e13..af6d465c489115ae347a13c09544aec4f2b785c3 --- a/script/solve_gfortran +++ b/script/solve_gfortran @@ -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]}