Skip to content
Snippets Groups Projects
Commit d5712847 authored by Santiago Ospina De Los Ríos's avatar Santiago Ospina De Los Ríos
Browse files

revert

parent 5f660964
No related branches found
No related tags found
1 merge request!49Resolve "Finish installation and usage instruction on the documentation"
......@@ -89,7 +89,6 @@ for flag in $CMAKE_FLAGS; do
[[ ${flag#-D} == CMAKE_INSTALL_PREFIX* ]] && CMAKE_INSTALL_PREFIX=${flag#-DCMAKE_INSTALL_PREFIX}
done
# TODO: This does not work well in Windows
# remove "=" or ":PATH=" prefix
CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX#=}
CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX#:PATH=}
......@@ -98,7 +97,7 @@ CMAKE_INSTALL_PREFIX=$(echo $CMAKE_INSTALL_PREFIX | tr -d "'")
[ -z $CMAKE_INSTALL_PREFIX ] && ONFAILURE_MESSAGE+="Options file **shall** provide a CMAKE_INSTALL_PREFIX\n" && exit 1
if ! command -v $CMAKE_INSTALL_PREFIX/bin/dunecontrol &> /dev/null; then
if command -v $CMAKE_INSTALL_PREFIX/bin/dunecontrol &> /dev/null; then
ONFAILURE_MESSAGE+="An installation of 'dunecontrol' was already found in '$CMAKE_INSTALL_PREFIX'\n"
ONFAILURE_MESSAGE+="A new setup **must** not override an old installation\n"
exit 1
......@@ -165,10 +164,8 @@ for module in $MODULES; do
if [ "$module" = "common" ]; then
DUNECONTROL=./dune-common/bin/dunecontrol
else if ! command -v $CMAKE_INSTALL_PREFIX/bin/dunecontrol &> /dev/null; then
DUNECONTROL=$CMAKE_INSTALL_PREFIX/bin/dunecontrol
else
DUNECONTROL=dunecontrol
DUNECONTROL=$CMAKE_INSTALL_PREFIX/bin/dunecontrol
fi
# configure, build, and install module
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment