From 6ae161d838dc677a25cb2ac333d4ec21a1123a4b Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 30 Aug 2017 10:10:38 +0200 Subject: [PATCH] #3118 creaToolsTools Feature New Normal - branch changestoITK3and4 --- Linux/scripts/ThirdParty-install-ITK.sh | 12 +- .../ThirdParty-install-gdcm.sh-NEW_gdcm2 | 166 ++++++++++++++++++ 2 files changed, 176 insertions(+), 2 deletions(-) create mode 100644 Linux/scripts/ThirdParty-install-gdcm.sh-NEW_gdcm2 diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh index d3ad3f5..b1c1aa8 100644 --- a/Linux/scripts/ThirdParty-install-ITK.sh +++ b/Linux/scripts/ThirdParty-install-ITK.sh @@ -147,6 +147,7 @@ fi fi tar -xzvf $itkfile + #fi # JPR ------------1 @@ -171,7 +172,13 @@ then cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/ ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/ cmake -D CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt - cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt + + cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt + if [ $ITKVersion = ITK3 ] + then + cmake -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt + fi + if [ $ITKVersion = ITK4 ] then @@ -179,7 +186,8 @@ then # cmake -D ITKV3_COMPATIBILITY:BOOL=ON -D ITKGroup_Nonunit:BOOL=ON -D ITKGroup_IO:BOOL=ON -D Module_ITK-Deprecated:BOOL=ON -D Module_ITK-Review:BOOL=ON CMakeCache.txt ##EED ITK4.12 - cmake -D ITKV3_COMPATIBILITY:BOOL=ON -D Module_ITKReview:BOOL=ON -D ITK_USE_SYSTEM_GDCM=ON CMakeCache.txt +# -D ITK_USE_SYSTEM_GDCM=ON + cmake -D ITKV3_COMPATIBILITY:BOOL=ON -D Module_ITKReview:BOOL=ON CMakeCache.txt fi cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh-NEW_gdcm2 b/Linux/scripts/ThirdParty-install-gdcm.sh-NEW_gdcm2 new file mode 100644 index 0000000..e2e8789 --- /dev/null +++ b/Linux/scripts/ThirdParty-install-gdcm.sh-NEW_gdcm2 @@ -0,0 +1,166 @@ +# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Santé) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ + + +#!/bin/bash + + if [ ! -f $PWD/scripts/CreaTools-configure.sh ] + then + echo + echo "..ERROR.." + echo "===================================================" + echo "REMEMBER !" + echo "" + echo "YOU NEED TO RUN 'Configure' (0) First !" + echo "===================================================" + echo + echo + exit 0 +fi + +source $PWD/scripts/CreaTools-configure.sh +#EED 2017-03-24 + source $PWD/scripts/LocalFunctions.sh + if [ `getDistrib` == "CentOS" ] && [ `getKernelVersion` < "2.6.34" ] + then + stdCompiler=c++98 + else + stdCompiler=c++03 + fi + + + echo "------" + echo $PWD/scripts/CreaTools-configure.sh + echo --generationdir-- + echo $generationdir + echo --docgeneration-- + echo $docgeneration + echo --installPrefix-- + echo $installPrefix + echo --installPrefixThird-- + echo $installPrefixThird + echo --buildType-- + echo $buildType + echo --gdcmVersion-- + echo $gdcmVersion +# echo --sourcesFrom-- +# echo $sourcesFrom +# echo --scriptDir-- +# echo $scriptDir +# echo --start_point-- +# echo $start_point + echo "------" + + +scriptDir=$PWD +sourcesDir=$generationdir/thirdparty_sources +binDir=$generationdir/thirdparty_bin + +if [ ! -e $generationdir ] +then + mkdir -p $generationdir + chown -R $loginUserName $generationdir + chgrp -R $loginGroupName $generationdir + +fi +if [ ! -e $sourcesDir ] +then + mkdir -p $sourcesDir + #was : (pb on MacOS?) + #chown -R $loginUserName:$loginGroupName $sourcesDir + chown -R $loginUserName $sourcesDir + chgrp -R $loginGroupName $sourcesDir +fi + +if [ ! -e $binDir ] +then + mkdir -p $binDir + chown -R $loginUserName $binDir + chgrp -R $loginGroupName $binDir +fi + + echo "we remove old stuff" + rm -rf $sourcesDir/gdcm* + rm -rf $binDir/gdcm* + + cd $sourcesDir + + echo "we download new stuff" + if [ $OperatingSystem = "MacOS" ] + then + curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz + # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-( + tar -xvf gdcm_05_Mai_2011.tar.gz + else +##19mai2015 +# wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz +#EED 2017-08-29 itk3toitk4 +# wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz +# tar -xvzf gdcm_05_Mai_2011.tar.gz + + wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm-2.8.2.tar.gz + tar -xvzf gdcm-2.8.2.tar.gz + + fi + +if [ $buildType = "Debug" ] +then + debug="ON" +else + debug="OFF" +fi + +# the following stupid test is used at debug time; Please don't remove! +#if [ true = false ] +if [ true = true ] +then + libname=gdcm-2.8.2 + dirInstall=$binDir/$libname-Bin + export GDCM_DIR=$installPrefixThird/lib/gdcm/ + mkdir -p $dirInstall + cd $dirInstall + + cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/ + ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/ + + cmake -D CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt + cmake -D VTK_DIR:PATH=$VTK_DIR CMakeCache.txt + cmake -D GDCM_USE_VTK:BOOL=ON CMakeCache.txt + cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt + + make -j $corenumber + make -j $corenumber install + cd .. +fi + +#if [ true = false ] +if [ true = true ] +then + cd $sourcesDir + cp tth $installPrefixThird/bin +fi + + +# deal with create creatools_third_party_libraries_config.sh +# is now done in ThirdParty-install-Finalize.sh + -- 2.47.1