From: Eduardo Davila Date: Mon, 27 Aug 2018 17:19:48 +0000 (+0200) Subject: #3224 creaToolsTools Feature New Normal - vtk8itk4wx3-mingw64 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1832054bdd6ce1b7d7aaf6d13416d9db15341081;p=creaToolsTools.git #3224 creaToolsTools Feature New Normal - vtk8itk4wx3-mingw64 --- 1832054bdd6ce1b7d7aaf6d13416d9db15341081 diff --cc Linux/installscript index a27e07a,2631d2b..04c273d --- a/Linux/installscript +++ b/Linux/installscript @@@ -246,18 -241,16 +246,16 @@@ if [ `checkVal $command all 3rd 3rd-bas bigDisplay "INSTALL PACKAGES DEPENDENCIES" source scripts/CreaTools-configure.sh cd scripts -- source ThirdParty-install-Base-Stuff.sh $OperatingSystem ++# source ThirdParty-install-Base-Stuff.sh $OperatingSystem cd .. bash scripts/ThirdParty-install.sh fi # vtk if [ `checkVal $command all 3rd 3rd-vtk` == true ] ; then - # if ! [ $OperatingSystem = "MacOS" ] ; then - bigDisplay "INSTALL VTK" - source scripts/ThirdParty-install-VTK.sh - cd $scriptDirName + bigDisplay "INSTALL VTK" - source scripts/ThirdParty-install-VTK.sh ++# source scripts/ThirdParty-install-VTK.sh + cd $scriptDirName - # fi fi # gdcm @@@ -279,7 -270,7 +277,7 @@@ f # wt if [ `checkVal $command all 3rd 3rd-wt` == true ] ; then bigDisplay "INSTALL WT" -- source scripts/ThirdParty-install-WT.sh ++# source scripts/ThirdParty-install-WT.sh cd $scriptDirName fi diff --cc Linux/scripts/ThirdParty-install-Base-rpm.sh index 25ddfa4,2b3072a..5d496fb --- a/Linux/scripts/ThirdParty-install-Base-rpm.sh +++ b/Linux/scripts/ThirdParty-install-Base-rpm.sh @@@ -145,27 -145,27 +145,28 @@@ the apt-get --yes install libosmesa6-dev #Mesa6 apt-get --yes install uuid-dev # uuid para la instalacion de itk apt-get --yes install libxaw7-dev # X11 - ;; + ;; MacOS) port selfupdate - port install cmake -y - port install doxygen -y - port install graphviz -y - # port install tetex -y (replaced by texlive) # cf EED : http://www.creatis.insa-lyon.fr/site/fr/CreatoolsInstallInstructionsv2.0.1MacOsv10.5.6-Developpers - port install texlive -y - port install latex2html -y - port install wxGTK -y - port install boost -y - ln -s libboost_signals-xgcc40-mt-1_38.dylib libboost_signals.dylib /opt/local/lib # cf EED : http://www.creatis.insa-lyon.fr/site - ln -s libboost_signals-xgcc40-mt-1_38.dylib libboost_signals.dylib /opt/local/lib # cf EED - ln -s libboost_filesystem-xgcc40-mt-1_38.dylib libboost_filesystem.dylib /opt/local/lib # cf EE - ln -s libboost_system-xgcc40-mt-1_38.dylib libboost_system.dylib /opt/local/lib # cf EE - port install sqlite3 -y - port install qt4-mac -y - ln -s qmake-mac qmake /opt/local/bin # cf EED - port install mesa -y - port install fcgi -y ## It's working ? - port install fcgi-devel -y ## It's working ? + port -N install wget -y + port -N install cmake -y + port -N install doxygen -y + port -N install graphviz -y + # port -N install tetex -y (replaced by texlive) # cf EED : http://www.creatis.insa-lyon.fr/site/fr/CreatoolsInstallInstructionsv2.0.1MacOsv10.5.6-Developpers + port -N install texlive -y + port -N install latex2html -y + port -N install wxWidgets-3.0 -y ++ port -N install wxgtk-3.0 -y + port -N install boost -y +# ln -s libboost_signals-xgcc40-mt-1_38.dylib libboost_signals.dylib /opt/local/lib # cf EED : http://www.creatis.insa-lyon.fr/site +# ln -s libboost_signals-xgcc40-mt-1_38.dylib libboost_signals.dylib /opt/local/lib # cf EED +# ln -s libboost_filesystem-xgcc40-mt-1_38.dylib libboost_filesystem.dylib /opt/local/lib # cf EE +# ln -s libboost_system-xgcc40-mt-1_38.dylib libboost_system.dylib /opt/local/lib # cf EE + port -N install sqlite3 -y +# port install qt4-mac -y +# ln -s qmake-mac qmake /opt/local/bin # cf EED +# port install mesa -y + port -N install fcgi -y ## It's working ? ;; *) echo " '$OperatingSystem' : Unknown (for us...) Operating Sytem " diff --cc Linux/scripts/ThirdParty-install-VTK.sh index ced69e1,4c9db74..e2f2679 --- a/Linux/scripts/ThirdParty-install-VTK.sh +++ b/Linux/scripts/ThirdParty-install-VTK.sh @@@ -112,45 -110,45 +112,47 @@@ f cd $sourcesDir echo "we download new stuff" -- if [ $OperatingSystem = "MacOS" ] -- then - - # EED 2013-10-29 - # curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz - # # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-( - # tar -xvf VTK-5.6.1.patchCreatis.tar.gz - -## EED 2013-10-29 -## curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz -## # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-( -## tar -xvf VTK-5.6.1.patchCreatis.tar.gz -- -- curl -O http://www.vtk.org/files/release/5.10/vtk-5.10.1.zip -- unzip vtk-5.10.1.zip -- cd VTK5.10.1/Rendering -- curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch -- patch < vtk-5.10.1.vtkXOpenGLRenderWindow.patch -- # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-( -- else -- --## 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 -- --## 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 -- wget https://www.vtk.org/files/release/8.1/VTK-8.1.1.zip -- unzip VTK-8.1.1.zip -- -- fi ++## if [ $OperatingSystem = "MacOS" ] ++## then ++## ++## # EED 2013-10-29 ++## # curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz ++## # # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-( ++## # tar -xvf VTK-5.6.1.patchCreatis.tar.gz ++## ++## curl -O http://www.vtk.org/files/release/5.10/vtk-5.10.1.zip ++## unzip vtk-5.10.1.zip ++## cd VTK5.10.1/Rendering ++## curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch ++## patch < vtk-5.10.1.vtkXOpenGLRenderWindow.patch ++## # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-( ++## else ++## ++## ## 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 ++## ++## ## 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 ++## wget https://www.vtk.org/files/release/8.1/VTK-8.1.1.zip ++## unzip VTK-8.1.1.zip ++## ++## fi ++ wget https://www.vtk.org/files/release/8.1/VTK-8.1.1.zip ++ unzip VTK-8.1.1.zip @@@ -226,7 -224,7 +228,7 @@@ the 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 BUILD_SHARE_LIBS:BOOL=ON -D VTK_USE_CARBON:BOOL=OFF -D VTK_USE_COCOA:BOOL=ON CMakeCache.txt cmake -D VTK_USE_TCL:BOOL=OFF CMakeCache.txt CMakeCache.txt fi diff --cc Linux/scripts/ThirdParty-install-gdcm.sh index d42809e,4d20397..d067f6b --- a/Linux/scripts/ThirdParty-install-gdcm.sh +++ b/Linux/scripts/ThirdParty-install-gdcm.sh @@@ -125,8 -123,7 +125,7 @@@ f wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm13_2018_05_28_vtk8.zip unzip gdcm13_2018_05_28_vtk8.zip - mv gdcm13_2018_05_28_vtk8 gdcm - - fi ++# mv gdcm13_2018_05_28_vtk8 gdcm if [ $buildType = "Debug" ] then