From 7a63446741d1d487e0e81c975c554a392f54f6f8 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Mon, 4 May 2020 17:52:11 +0200 Subject: [PATCH] #3421 creaToolsTools Feature New Normal - creatools version 4.0.0 - Linux --- Linux/scripts/CreaTools-GenerateBinTGZ.sh | 9 +++++---- Linux/scripts/bbtkVariables.sh | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh index a672776..1c7be80 100644 --- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh +++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh @@ -47,7 +47,8 @@ ln -s $installPrefixThird thirdparty_install source creatools_install/share/creatools/Version.sh - distanceAdress=davila@tux.creatis.insa-lyon.fr:creatools/creaTools/v$creatoolsMajorVersion.$creatoolsMinorVersion.x/ +# distanceAdress=davila@tux.creatis.insa-lyon.fr:creatools/creaTools/v$creatoolsMajorVersion.$creatoolsMinorVersion.x/ + distanceAdress=davila@tux.creatis.insa-lyon.fr:creatools/creaTools/v$creatoolsMajorVersion.x.x/ fileTGZ=CreaTools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-`getDistrib`-`getDistribVersion`.tgz fileTGZstring=CreaTools-Bin-Release-\$creatoolsMajorVersion.\$creatoolsMinorVersion.\$creatoolsBuildVersion-\`getDistrib\`-\`getDistribVersion\` @@ -66,7 +67,7 @@ cat creatools_install/share/creatools/Version.sh >> $filename_BinVersion cat $scriptDir/LocalFunctions.sh >> $filename_BinVersion - echo "\`getDownloadCommand\` http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.\$creatoolsMinorVersion.x/$fileTGZstring.tgz" >> $filename_BinVersion + echo "\`getDownloadCommand\` http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.x.x/$fileTGZstring.tgz" >> $filename_BinVersion echo "tar -xvzf $fileTGZstring.tgz" >> $filename_BinVersion echo "rm -f $fileTGZstring.tgz" >> $filename_BinVersion @@ -107,9 +108,9 @@ cd $scriptsDir scp $scriptDir/Install-Creatools-Bin.sh $distanceAdress/Install-Creatools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh - ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm Install-Creatools-Bin-Release.sh; ln -s v3.0.x/Install-Creatools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh Install-Creatools-Bin-Release.sh" + ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm Install-Creatools-Bin-Release.sh; ln -s v4.x.x/Install-Creatools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh Install-Creatools-Bin-Release.sh" - ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm creatools-Linux-Bin.sh; ln -s v3.0.x/$filename_BinVersion creatools-Linux-Bin.sh" + ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm creatools-Linux-Bin.sh; ln -s v4.x.x/$filename_BinVersion creatools-Linux-Bin.sh" echo "" diff --git a/Linux/scripts/bbtkVariables.sh b/Linux/scripts/bbtkVariables.sh index b9fa9a5..daa397f 100644 --- a/Linux/scripts/bbtkVariables.sh +++ b/Linux/scripts/bbtkVariables.sh @@ -42,7 +42,7 @@ boolgdcm2=OFF boolgdcm1=ON fi -cmake -D CMAKE_CXX_FLAGS:STRING=-fPIC -D crea_DIR:PATH=$2/creatools_bin/creaBin CMakeCache.txt +cmake -D CMAKE_CXX_FLAGS:STRING=-fPIC -fopenmp -D crea_DIR:PATH=$2/creatools_bin/creaBin CMakeCache.txt cmake -D --BUILD_ALL:BOOL=ON CMakeCache.txt echo ============================================================================================= echo cmake -D USE_GDCM2:BOOL=$boolgdcm2 -D USE_GDCM:BOOL=$boolgdcm1 -D BUILD_BBTK_DOC_GUIDES_HTML:BOOL=$3 -D BUILD_BBTK_DOC_GUIDES_PDF:BOOL=$3 -D BUILD_BBTK_DOC_DOXYGEN:BOOL=$3 -D BUILD_BBTK_DOC_PACKAGE:BOOL=$3 CMakeCache.txt -- 2.45.1