ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/REPOS_ERICCA/magic/linux/instal_magic.bash
(Generate patch)

Comparing magic/linux/instal_magic.bash (file contents):
Revision 898 by francois, Wed Jul 19 18:43:15 2017 UTC vs.
Revision 1075 by francois, Tue Aug 10 17:02:54 2021 UTC

# Line 14 | Line 14 | echo $(date)
14   echo ""
15   echo "MAGiC installation"
16   echo "Checking / Installing dependencies"
17 < tabdep=(gmsh gfortran python cmake cmake-curses-gui subversion libvtk5-dev g++ gcc python-dev python-numpy python-qt4 tk bison flex libblas-dev liblapack-dev libmotif-dev libxi-dev)
17 > tabdep=(gmsh gfortran python cmake cmake-curses-gui subversion libvtk6-dev g++ gcc python-dev python-numpy python-qt4 tk bison flex libblas-dev liblapack-dev libmotif-dev libxi-dev libxmu-dev)
18   versionos=$(lsb_release -sr)
19   if [ "$2" == "tout" ];
20   then
# Line 23 | Line 23 | if [ "$versionos" \< "15" ];
23   then
24   tabdep=( "${tabdep[@]}" "kdesvn")
25   fi
26 – if [ "$versionos" \> "15" ];
26   then
27   tabdep=( "${tabdep[@]}" "rabbitvcs-nautilus")
28   fi
# Line 62 | Line 61 | mkdir build
61   cd build
62   cmake ..
63   sudo make install
65 – cd $__DIR
64   fi
65 + cd $__DIR
66  
67  
68   echo "Installation MAGiC"
69   __DIR=`pwd`
70   echo $__DIR
71   cd $__DIR
72 < if [ ! -d cadxfem ];
73 < then
74 < echo "Getting nutil from cadxfem"
75 < svn co https://cg-dev.ltas.ulg.ac.be/svn/cadxfem/nutil cadxfem/nutil
76 < else
77 < echo "Updating nutil from cadxfem"
78 < cd cadxfem/nutil
79 < svn up
80 < fi
72 > #if [ ! -d cadxfem ];
73 > #then
74 > #echo "Getting nutil from cadxfem"
75 > #svn co https://cg-dev.ltas.ulg.ac.be/svn/cadxfem/nutil cadxfem/nutil
76 > #else
77 > #echo "Updating nutil from cadxfem"
78 > #cd cadxfem/nutil
79 > #svn up
80 > #fi
81   cd $__DIR
82   if [ ! -d magic ];
83   then
# Line 90 | Line 89 | cd magic
89   svn up
90   fi
91   cd $__DIR/magic/exe
92 < cmake .. -DENABLE_NUTIL=ON -DCMAKE_BUILD_TYPE=Debug -DENABLE_TUTORIEL=ON -DENABLE_TEST=ON
92 > cmake .. -DENABLE_NUTIL=ON -DCMAKE_BUILD_TYPE=Debug -DENABLE_TUTORIEL=ON -DENABLE_TEST=OFF -DENABLE_VTKDISPLAY=ON
93   make
94   echo "Check target"
95   cd $__DIR/magic/exe/app/mgoperation/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines