#
if [ $sourcesFrom = GIT ] || [ $sourcesFrom = GIT-READ-ONLY ];
then
- ssh-add
+ ssh-add
bash $scriptDir/gitclone.sh $creasource $generationdir $sourcesFrom
bash $scriptDir/gitclone.sh $bbtksource $generationdir $sourcesFrom
bash $scriptDir/gitclone.sh $creavtksource $generationdir $sourcesFrom
bash $scriptDir/gitclone.sh $creaminitoolssource $generationdir $sourcesFrom
bash $scriptDir/gitclone.sh $creatoolstoolssource $generationdir $sourcesFrom
# bash $scriptDir/cvscheckout.sh $libidosource-ESRF $generationdir $cvsUserName
- # mv $libidosource-ESRF $libidosource
+ # mv $libidosource-ESRF $libidosource
+
+ cd $generationdir/creatools_source/$creasource
- git checkout vtk7itk4
++ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$bbtksource
- git checkout vtk7itk4
++ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$creavtksource
- git checkout vtk7itk4
++ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$creamaracassource
- git checkout vtk7itk4
++ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$creaimagesource
- git checkout vtk7itk4
++ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$creacontourssource
- git checkout vtk7itk4
++ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$crearigidregistrationssource
- git checkout vtk7itk4
++ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$bbtkgeditorsource
- git checkout vtk7itk4
++ git checkout vtk7itk4wx3
+ cd $generationdir/creatools_source/$creatoolssource
- git checkout vtk7itk4
-
++ git checkout vtk7itk4wx3
fi
if [ $sourcesFrom = HTML ]
echo "------"
+#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
+
+
+
scriptDir=$PWD
sourcesDir=$generationdir/thirdparty_sources
binDir=$generationdir/thirdparty_bin
## EED 2013-10-29
## wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
## tar -xzvf VTK-5.6.1.patchCreatis.tar.gz
- wget http://www.vtk.org/files/release/5.10/vtk-5.10.1.zip
- echo unzip vtk-5.10.1.zip
- pwd
- unzip vtk-5.10.1.zip
-
- cd VTK5.10.1/Rendering
- ##EED19mai2015 wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
- wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
- patch < vtk-5.10.1.vtkXOpenGLRenderWindow.patch
-
- cd ../CMake
- wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkCompilerExtras.cmake-PATCH
- patch < vtk-5.10.1.vtkCompilerExtras.cmake-PATCH
+ ## EED 2016-12-28
+ ## wget http://www.vtk.org/files/release/5.10/vtk-5.10.1.zip
+ ## echo unzip vtk-5.10.1.zip
+ ## pwd
+ ## unzip vtk-5.10.1.zip
+ ## cd VTK5.10.1/Rendering
+ ####EED19mai2015 wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
+ ## wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
+ ## patch < vtk-5.10.1.vtkXOpenGLRenderWindow.patch
+ ## cd ../CMake
+ ## wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkCompilerExtras.cmake-PATCH
+ ## patch < vtk-5.10.1.vtkCompilerExtras.cmake-PATCH
+
+ wget http://www.vtk.org/files/release/7.1/VTK-7.1.0.zip
+ unzip VTK-7.1.0.zip
fi
# debug="OFF"
#fi
+ ### the following stupid test is used at debug time; Please don't remove!
+ ###if [ true = false ]
+ ##if [ true = true ]
+ ##then
+ ## libname=VTK5.10.1
+ ## dirInstall=$binDir/$libname-Bin
+ #### export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
+ ## export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
+ ##
+ ## mkdir -p $dirInstall
+ ## echo "we prepare directories dirInstall " $dirInstall " VTK_DIR " $installPrefixThird/lib/vtk-5.10.1/
+ ## cd $dirInstall
+ ##
+ ### See EED why we have to do this
+ ## if [ $OperatingSystem = "MacOS" ]
+ ## then
+ ## cmake -D CMAKE_CXX_COMPILER:FILE=/usr/bin/g++
+ ## fi
+ ## 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
+ ##
+ ## if [ $OperatingSystem = "MacOS" ]
+ ## then
+ ## cmake -D BUILD_SHARE_LIBS:BOOL=ON -D VTK_USE_CARBON:BOOL=ON -D VTK_USE_COCOA:BOOL=OFF CMakeCache.txt
+ ## cmake -D VTK_USE_TCL:BOOL=OFF CMakeCache.txt
+ ## CMakeCache.txt
+ ## fi
+ ##
+ ## cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt
+ ## cmake -D CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt
+ ##
+ ####EED 2016-12-22 make -j $corenumber
+ ## make -j $corenumber
+ ## make -j $corenumber install
+ ## cd ..
+ ##fi
+
+
# the following stupid test is used at debug time; Please don't remove!
#if [ true = false ]
if [ true = true ]
then
- libname=VTK5.10.1
+ libname=VTK-7.1.0
dirInstall=$binDir/$libname-Bin
## export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
- export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
+ export VTK_DIR=$installPrefixThird/lib/cmake/vtk-7.1/
mkdir -p $dirInstall
- echo "we prepare directories dirInstall " $dirInstall " VTK_DIR " $installPrefixThird/lib/vtk-5.10.1/
+ echo "we prepare directories dirInstall " $dirInstall " VTK_DIR " $installPrefixThird/lib/vtk-7.1/
cd $dirInstall
# See EED why we have to do this
then
cmake -D CMAKE_CXX_COMPILER:FILE=/usr/bin/g++
fi
+
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
CMakeCache.txt
fi
- cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt
- cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt
+ cmake -D VTK_Group_Views:BOOL=ON -D VTK_Group_Qt:BOOL=ON CMakeCache.txt
+ cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON CMakeCache.txt
-##?? cmake -D CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt
##EED 2016-12-22 make -j $corenumber
make -j $corenumber
make -j $corenumber install
cd ..
+
fi
+
+
+
+
+
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
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
- 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
+
+ ##VTK-5
+ # 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_10_Mars_2017-vtk7.tar.gz
+ tar -xvzf gdcm_10_Mars_2017-vtk7.tar.gz
+
fi
if [ $buildType = "Debug" ]
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_VTK:BOOL=ON -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
- cmake -D CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt
+ cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt
make -j $corenumber
make -j $corenumber install
cd ..
git://git.creatis.insa-lyon.fr / creaToolsTools.git / commitdiff