Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Sbalzarini Lab
S
Software
P
Parallel Computing
OpenFPM
openfpm_pdata
Commits
6e39b110
Commit
6e39b110
authored
Jan 26, 2016
by
Pietro Incardona
Browse files
Merge branch 'master' into numerics
parents
c5cc4af8
2034ff60
Changes
3
Hide whitespace changes
Inline
Side-by-side
.gitmodules
View file @
6e39b110
[submodule "openfpm_vcluster"]
path = openfpm_vcluster
url = ssh://git@ppmcore
mirror.dynu.com:2222
/incardon/openfpm_vcluster.git
url = ssh://git@ppmcore
.mpi-cbg.de
/incardon/openfpm_vcluster.git
[submodule "openfpm_devices"]
path = openfpm_devices
url = ssh://git@ppmcore
mirror.dynu.com:2222
/incardon/openfpm_devices.git
url = ssh://git@ppmcore
.mpi-cbg.de
/incardon/openfpm_devices.git
[submodule "openfpm_io"]
path = openfpm_io
url = ssh://git@ppmcore
mirror.dynu.com:2222
/incardon/openfpm_io.git
url = ssh://git@ppmcore
.mpi-cbg.de
/incardon/openfpm_io.git
[submodule "openfpm_data"]
path = openfpm_data
url = ssh://git@ppmcore
mirror.dynu.com:2222
/incardon/openfpm_data.git
url = ssh://git@ppmcore
.mpi-cbg.de
/incardon/openfpm_data.git
[submodule "openfpm_numerics"]
path = openfpm_numerics
url = ssh://git@ppmcore
mirror.dynu.com:2222
/incardon/openfpm_numerics.git
url = ssh://git@ppmcore
.mpi-cbg.de
/incardon/openfpm_numerics.git
install
View file @
6e39b110
...
...
@@ -42,6 +42,10 @@ discover_os
## Remove old dependencies and installations
if
[
x
"
$i_dir
"
==
x
" "
]
;
then
i_dir
=
"
$HOME
"
fi
remove_old
$i_dir
## Check and try to install the prerequisites
...
...
@@ -68,7 +72,6 @@ cd openfpm_data
if
[
!
-d
src/config
]
;
then
mkdir
src/config
fi
git checkout develop
cd
..
cd
openfpm_devices
...
...
@@ -105,10 +108,6 @@ fi
## check for options
if
[
x
"
$i_dir
"
==
x
" "
]
;
then
i_dir
=
"
$HOME
"
fi
echo
-e
"
\0
33[1;34;5mDEPENCENCIES INSTALLATION DIR
\0
33[0m"
echo
-e
"Every required dependencies if needed will be installed into:
\0
33[1;34;5m
$i_dir
\0
33[0m"
echo
-e
"if you want to install somewhere else do ./install -i /somewhere/else"
...
...
script/remove_old
View file @
6e39b110
...
...
@@ -5,7 +5,7 @@ function remove_old()
## Get the previos openFPM installation
previous_inst
=
$(
cat
$PWD
/install_dir
)
if
[
x
"
$previous_inst
"
!=
x
""
]
;
then
if
[
x
"
$previous_inst
"
!=
x
""
]
;
then
echo
"Found previous installation"
if
[
-d
"
$previous_inst
/openfpm_pdata"
]
;
then
echo
"Removing the folder:
$previous_inst
/openfpm_pdata"
...
...
@@ -76,7 +76,7 @@ function remove_old()
## Check the installed version of the dependencies
is_update
=
$(
cat
$1
/BOOST/include/boost/version.hpp |
grep
"#define BOOST_VERSION 106000"
)
if
[
x
"
$is_update
"
==
x
""
]
;
then
if
[
x
"
$is_update
"
==
x
""
]
;
then
echo
"New boost version, removing the old one"
rm
-rf
$1
/BOOST/include
rm
-rf
$1
/BOOST/lib
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment