]> Creatis software - creaToolsTools.git/commitdiff
#3376 creaToolsTools Bug New Normal - vtk8itk5wx3-mingw64
authorEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Sun, 12 Apr 2020 12:01:30 +0000 (14:01 +0200)
committerEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Sun, 12 Apr 2020 12:01:30 +0000 (14:01 +0200)
28 files changed:
Install_mingw64/Install_CreaTools/creatools.bat
Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat
Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat
Install_mingw64/Install_CreaTools/scripts/creaContoursVariables.bat
Install_mingw64/Install_CreaTools/scripts/creaMaracasVariables.bat
Install_mingw64/Install_CreaTools/scripts/creaVtkVariables.bat
Install_mingw64/Install_CreaTools/scripts/tmp.sh
Install_mingw64/Install_ThirdParty/install-All.bat
Install_mingw64/Install_ThirdParty/scripts/download_ThirdPartySW.bat
Linux/installscript
Linux/scripts/CreaTools-GenerateBinTGZ.sh
Linux/scripts/CreaTools-compile.sh
Linux/scripts/CreaTools-install.sh
Linux/scripts/CreaTools-load.sh
Linux/scripts/LocalFunctions.sh
Linux/scripts/ThirdParty-install-Base-Stuff.sh
Linux/scripts/ThirdParty-install-Base-rpm.sh
Linux/scripts/ThirdParty-install-Finalize.sh
Linux/scripts/ThirdParty-install-ITK.sh
Linux/scripts/ThirdParty-install-VTK.sh
Linux/scripts/ThirdParty-install-WT.sh
Linux/scripts/ThirdParty-install-gdcm.sh
Linux/scripts/ThirdParty-install-gdcm.sh-NEW_gdcm2 [new file with mode: 0644]
Linux/scripts/compilemod.sh
Linux/scripts/creaMaracasVariables.sh
Linux/scripts/creaVariables.sh
Linux/scripts/creaVtkVariables.sh
Linux/scripts/installmod.sh

index c5e873940c0453cfbf3116647162115d3f608c57..e58100f846c17dc7dc327d74df746cecf2c44de5 100644 (file)
@@ -1,6 +1,5 @@
 @echo off
 
-
 set baseProject=C:\Eduardo\Creatis
 set ProgramFiles=C:\Program Files (x86)
 
@@ -10,9 +9,6 @@ set ProgramFiles=C:\Program Files (x86)
 ::set baseProject=E:\creatis\c_mingw
 ::set ProgramFiles=C:\Program Files (x86)
 
-
-
-
 set docGeneration=OFF
 set cmakeBin=%baseProject%\DevelopperTools\cmake-3.11.2-win64-x64\bin\cmake.exe
 set creatoolsGeneration=%baseProject%\C10\ct
index c1ed5a7bbfe8401df29290d3a6527cf99a424f29..d2fc6835b8dcfbee6d67e1338b5886719b3bdc27 100644 (file)
@@ -41,64 +41,64 @@ echo cd %creatoolsGeneration2%/cs                                                                                                           >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creasource%                                    >> tmp.sh
 echo cd %creasource%                                                                                                                                           >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%bbtksource%                                    >> tmp.sh
 echo cd %bbtksource%                                                                                                                                           >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creamaracassource%                     >> tmp.sh
 echo cd %creamaracassource%                                                                                                                    >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creavtksource%                                 >> tmp.sh
 echo cd %creavtksource%                                                                                                                                >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaenvironmentsource%                 >> tmp.sh
 echo cd %creaenvironmentsource%                                                                                                                >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creabrukersource%                              >> tmp.sh
 echo cd %creabrukersource%                                                                                                                     >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaimagesource%                               >> tmp.sh
 echo cd %creaimagesource%                                                                                                                      >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creacontourssource%            >> tmp.sh
 echo cd %creacontourssource%                                                                                                                           >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%crearigidregistrationssource%          >> tmp.sh
 echo cd %crearigidregistrationssource%                                                                                                 >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%bbtkgeditorsource%                     >> tmp.sh
 echo cd %bbtkgeditorsource%                                                                                                                    >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaminitoolssource%                   >> tmp.sh
 echo cd %creaminitoolssource%                                                                                                                  >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creatoolssource%                               >> tmp.sh
 echo cd %creatoolssource%                                                                                                                      >> tmp.sh
-echo git checkout vtk7itk4wx3-mingw64                                                                                                  >> tmp.sh
+echo git checkout vtk8itk4wx3-mingw64                                                                                                  >> tmp.sh
 echo cd ..                                                                                                                                                             >> tmp.sh
 
 
index 17b394f3933eb61d45f89c3d7ae19e4f4e7a7032..52fed20126b4c13eeb7de94e568ac531e3973d7a 100644 (file)
@@ -52,7 +52,7 @@ IF %4==Debug (
 
 %cmakeBin% -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BUILD_BBTK_DOC:BOOL=%3 -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
-%cmakeBin% -D CMAKE_CXX_FLAGS:STRING="-fpermissive" CMakeCache.txt
+%cmakeBin% -D CMAKE_CXX_FLAGS:STRING="-fpermissive -std=c++11" CMakeCache.txt
 %cmakeBin% CMakeCache.txt
 
 exit /B
index 7e2febb2a7f06e790ecf2c964ce2b5ff22e186f5..243be20af3a633d46844d2631a2c7811205b922e 100644 (file)
@@ -52,6 +52,7 @@ echo %1=creabrukersource% %2=docgeneration
 
 %cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D creaEnvironment_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D creaMaracasVisu_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D creaImageIO_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
+%cmakeBin% -D BUILD_BBTK_PACKAGE_creaContours:BOOL=ON      CMakeCache.txt
 %cmakeBin% -D creaContours_DOC:BOOL=%2 -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=%2 CMakeCache.txt
 %cmakeBin% CMakeCache.txt
 
index 44f47a495504a9f42bcdf48c5a9e6ccb4c591e72..23aab2b5a9c376d0823080f29bcd46ef964216d6 100644 (file)
@@ -54,7 +54,7 @@ IF %4==Debug (
 ::%cmakeBin%  -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 ::%cmakeBin%  CMakeCache.txt
 
-%cmakeBin% -D CMAKE_CXX_FLAGS:STRING=/openmp
+%cmakeBin% -D CMAKE_CXX_FLAGS:STRING=-openmp
 %cmakeBin%  -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin%  -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin%  -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=%3 CMakeCache.txt
index b650848db009f7ad5adc926200c87d72abed0fdb..8e85bbb315d5a1d058354ccc7ccdb8c148284827 100644 (file)
@@ -47,6 +47,7 @@ cd %binfolder%
 ::%cmakeBin% -D BUILD_BBTK_PACKAGE_creaVtk_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 ::%cmakeBin% CMakeCache.txt
 
+%cmakeBin% -D CMAKE_CXX_FLAGS:STRING=-openmp
 %cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BUILD_BBTK_PACKAGE_creaVtk:BOOL=ON -D creaVtk_DOC:BOOL=%3 CMakeCache.txt
@@ -55,4 +56,4 @@ cd %binfolder%
 
 
 
-exit /B
\ No newline at end of file
+exit /B
index e17e65ebc8409f14a4e4827c231f8b79dc29257c..14d4f8c563abe239da349e8abee9bbc4c196d78a 100644 (file)
@@ -4,49 +4,49 @@ mkdir C:/Eduardo/Creatis/C10/ct/cs
 cd C:/Eduardo/Creatis/C10/ct/cs                                                                                                        
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/crea                                         
 cd crea                                                                                                                                        
-git checkout vtk7itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk4wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/bbtk                                         
 cd bbtk                                                                                                                                        
-git checkout vtk7itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk4wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaMaracasVisu                      
 cd creaMaracasVisu                                                                                                                     
-git checkout vtk7itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk4wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaVtk                              
 cd creaVtk                                                                                                                             
-git checkout vtk7itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk4wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaEnvironment              
 cd creaEnvironment                                                                                                             
-git checkout vtk7itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk4wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaBruker                           
 cd creaBruker                                                                                                                          
-git checkout vtk7itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk4wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaImageIO                                  
 cd creaImageIO                                                                                                                         
-git checkout vtk7itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk4wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaContours                 
 cd creaContours                                                                                                                        
-git checkout vtk7itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk4wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaRigidRegistration        
 cd creaRigidRegistration                                                                                               
-git checkout vtk7itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk4wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/bbtkGEditor                          
 cd bbtkGEditor                                                                                                                         
-git checkout vtk7itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk4wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaMiniTools                        
 cd creaMiniTools                                                                                                               
-git checkout vtk7itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk4wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
 git clone ssh://gitolite@git.creatis.insa-lyon.fr/creaTools                            
 cd creaTools                                                                                                                           
-git checkout vtk7itk4wx3-mingw64                                                                                                       
+git checkout vtk8itk4wx3-mingw64                                                                                                       
 cd ..                                                                                                                                                          
index cdcf484e4fa0f7efa7e7bd50c1ece3d111be4375..80f36ed45f128a013f72bc72c8633e8621b9250f 100644 (file)
@@ -1,22 +1,16 @@
 
 set thirdpartyGenerationBase=C:\Eduardo\Creatis\C10\tpl\
-
 set cmakeBin=C:\Eduardo\Creatis\DevelopperTools\cmake-3.11.2-win64-x64\bin\cmake.exe
-
 set wgetPath="C:\Eduardo\Creatis\DevelopperTools\wget-1.19.4-win32\wget.exe"
-
 set zipPath="C:\Program Files\7-Zip\7z.exe"
 ::set zipPath="peazip -ext2here "
-
 set DirMingwDlls=C:\Eduardo\Creatis\DevelopperTools\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin
-
 set PATH=C:\Windows\system32;C:\Eduardo\Creatis\DevelopperTools\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin;
 
-
 start /wait install_generate_thirdparty-x64Release.bat
 
 ::REM start /wait install_generate_thirdparty-x64Debug.bat
 ::REM start /wait install_generate_thirdparty-x86Release.bat
 ::     REM start /wait install_generate_thirdparty-x86Debug.bat
 
-::pause
\ No newline at end of file
+::pause
index 79f1bc4e7365846cb052ca6ac8f0e443fb88eae9..f4bdad19b2dd1b3509ba470da3d45730ddf64267 100644 (file)
@@ -67,7 +67,7 @@ set VTKFNAME=VTK-8.1.1-Patch.7z
 ::set GDCMFNAME=gdcm_05_Mai_2011.tar
 ::set GDCMFNAME=gdcm_11_Oct_2011.tar
 ::set GDCMFNAME=gdcm_10_Mars_2017-vtk7.tar
-set GDCMFNAME=gdcm13_2018_05_28_vtk8.zip
+set GDCMFNAME=gdcm13_2019_06_17_vtk8.zip
 set TTHFNAME=tth_exe.zip
 set SQLITEFNAME=sqlite_v3.6.23.1.zip
 set JOMFNAME=jom.zip
index a1ff1d41d03f832fe7b1f39d7e8931804a37cc62..cac6ea6760b1a861e9846e8eaa67631ce9627d4e 100755 (executable)
 
 #!/bin/bash -e
 
-scriptDirName=$(dirname $(readlink -f $0) )
+#EED 2018-08-26
+
+#scriptDirName=$(dirname $(readlink -f $0) )
+scriptDirName=$(pwd)
 
 #########################################################################
 ############     Local Functions  #######################################
@@ -38,17 +41,19 @@ configureFile="scripts/CreaTools-configure.sh"
 # default configuration parameters
 OperatingSystem=`getDistrib`
 corenumber=`getncore`
+echo "hola1"
 generationdir=$HOME/Creatis/creaTools
 installPrefixThird=
 installPrefix=
 docgeneration=OFF
 sourcesFrom=GIT
 
+
 loginUserName=$USER
 loginGroupName=`groups | awk '{print $1}'`
 buildType=Release
 gdcmVersion=GDCM1
-ITKVersion=ITK3
+ITKVersion=ITK4
 export ETC_BASHRC=`getbashrc`
 
 
@@ -174,8 +179,8 @@ fi
 checkDistrib $OperatingSystem
 
 # complete default install prefix
-if [ -z "$installPrefix" ]      ; then installPrefix=$generationdir/creatools_install; fi
-if [ -z "$installPrefixThird" ] ; then installPrefixThird=$generationdir/thirdparty_install; fi
+if [ -z "$installPrefix" ]      ; then installPrefix=$generationdir/ci; fi
+if [ -z "$installPrefixThird" ] ; then installPrefixThird=$generationdir/tpli; fi
 
 # check build type
 if [ `checkVal $buildType Release Debug RelWithDebug` == "false" ] ; then
@@ -248,9 +253,9 @@ fi
 
 # vtk
 if [ `checkVal $command all 3rd 3rd-vtk` == true ] ; then
-    bigDisplay "INSTALL VTK"
-    source scripts/ThirdParty-install-VTK.sh
-    cd $scriptDirName
+           bigDisplay "INSTALL VTK"
+               source scripts/ThirdParty-install-VTK.sh
+       cd $scriptDirName
 fi
 
 # gdcm
@@ -262,8 +267,8 @@ fi
 
 # itk
 if [ `checkVal $command all 3rd 3rd-itk` == true ] ; then
-    bigDisplay "INSTALL $ITKVersion"
-    bash scripts/ThirdParty-install-ITK.sh
+       bigDisplay "INSTALL $ITKVersion"
+       bash scripts/ThirdParty-install-ITK.sh
     cd $scriptDirName
 fi
 
index a0bd36d91cf034e6c89a5186d1dfea9fdc1c7e72..a672776e53dfff9d4227631bb5041b52f5791fae 100644 (file)
      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 v2.6.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 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 creatools-Linux-Bin.sh;  ln -s v2.6.x/$filename_BinVersion  creatools-Linux-Bin.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"
 
 
      echo ""
index 7797dce4d2902446c791d4942b42df4c5d028352..3cab2f5d72342c7eabcbe7f92a21e5aa0e147013 100644 (file)
@@ -135,6 +135,7 @@ then
 #if [ true = false ]
    if [ true = true ]
    then
+
       bash $scriptDir/cmakemod.sh                  $creasource $generationdir $installPrefix $buildType 
       bash $scriptDir/creaVariables.sh             $creasource $generationdir $docgeneration
       bash $scriptDir/compilemod.sh     $buildType $creasource $generationdir $corenumber
@@ -164,8 +165,19 @@ then
      echo ========================================================= $bbtksource $generationdir $installPrefix $buildType
      bash $scriptDir/cmakemod.sh               $bbtksource $generationdir $installPrefix $buildType
      bash $scriptDir/bbtkVariables.sh          $bbtksource $generationdir $docgeneration $gdcmVersion
-     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber
-     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbtk
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbi
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbfy
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbStudio
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbPackageBrowser
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbs2cpp
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbRegenerateBoxesLists
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbRegeneratePackageDoc
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbPlugPackage
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbpConfigurator
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbvtk
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber bbwx
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber 
      bash $scriptDir/ctestmod.sh               $bbtksource $generationdir
    fi
 fi
index c75afa726d94204169b3977213b82c5d7ea7efed..33af6db1173f3f9d50d3e7d0fadeeca9d2122eeb 100644 (file)
   #  modify /etc/bashrc (we cannot modify .bashrc, since we switched as root)  
   # - add line 'bash $installPrefix/creatools_install/share/creatools_base_library_config.sh'
 
-  bash installmod.sh $buildType $creasource                   $generationdir  $installPrefix
-  bash installmod.sh $buildType $bbtksource                   $generationdir  $installPrefix
-  bash installmod.sh $buildType $creavtksource                $generationdir  $installPrefix
-  bash installmod.sh $buildType $creamaracassource            $generationdir  $installPrefix
-  bash installmod.sh $buildType $creaenvironmentsource        $generationdir  $installPrefix
-  bash installmod.sh $buildType $creabrukersource             $generationdir  $installPrefix
-  bash installmod.sh $buildType $creaimagesource              $generationdir  $installPrefix
-  bash installmod.sh $buildType $creacontourssource           $generationdir  $installPrefix
-  bash installmod.sh $buildType $crearigidregistrationssource $generationdir  $installPrefix
-  bash installmod.sh $buildType $bbtkgeditorsource            $generationdir  $installPrefix
-  bash installmod.sh $buildType $creatoolssource              $generationdir  $installPrefix
-  bash installmod.sh $buildType $creaminitoolssource          $generationdir  $installPrefix
+  bash installmod.sh $buildType $creasource                   $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $bbtksource                   $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $creavtksource                $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $creamaracassource            $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $creaenvironmentsource        $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $creabrukersource             $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $creaimagesource              $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $creacontourssource           $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $crearigidregistrationssource $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $bbtkgeditorsource            $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $creatoolssource              $generationdir  $installPrefix  $corenumber
+  bash installmod.sh $buildType $creaminitoolssource          $generationdir  $installPrefix  $corenumber
   # bash installmod.sh $buildType $libidosource                 $generationdir  $installPrefix 
 
   #export as well bbPackages_DIR // JPR 25 Mai 2011
index d85a4b4589871f2c61f1c32a61dd7d521842a450..571b4e475df84ce8fbbe5148fddc4088ab48fb11 100644 (file)
@@ -106,7 +106,7 @@ then
 #
       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 
@@ -121,7 +121,30 @@ then
          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 vtk8itk5wx3-mingw64
+         cd $generationdir/creatools_source/$bbtksource
+                git checkout vtk8itk5wx3-mingw64
+         cd $generationdir/creatools_source/$creavtksource
+                git checkout vtk8itk5wx3-mingw64
+         cd $generationdir/creatools_source/$creamaracassource
+                git checkout vtk8itk5wx3-mingw64
+         cd $generationdir/creatools_source/$creaimagesource
+                git checkout vtk8itk5wx3-mingw64
+         cd $generationdir/creatools_source/$creacontourssource
+                git checkout vtk8itk5wx3-mingw64
+         cd $generationdir/creatools_source/$crearigidregistrationssource
+                git checkout vtk8itk5wx3-mingw64
+         cd $generationdir/creatools_source/$bbtkgeditorsource
+                git checkout vtk8itk5wx3-mingw64
+         cd $generationdir/creatools_source/$creatoolssource
+                git checkout vtk8itk5wx3-mingw64
+       cd $generationdir/creatools_source/$creabrukersource
+                git checkout vtk8itk5wx3-mingw64
+       cd $generationdir/creatools_source/$creaminitoolssource
+                git checkout vtk8itk5wx3-mingw64
       fi
 
       if [ $sourcesFrom = HTML ]
index 084c2a19c4dc790a5280f2023c8dd2aff79722a3..662fbae0d65c126df57ced28728e28c141813ad4 100644 (file)
@@ -121,7 +121,9 @@ function getDownloadCommand {
 ###########################################
 function getncore {
     if [ `uname` == Darwin ] ; then # MacOS
-        system_profiler | grep Processor | awk '$1=="Number" {print $4}'
+#EED 2018-08-26
+#        system_profiler | grep Processor | awk '$1=="Number" {print $4}'
+        sysctl hw.physicalcpu hw.logicalcpu | grep logicalcpu | awk '{print $2}'
     else
         cat /proc/cpuinfo | grep processor | wc -l
     fi
index 088e02b4c8ec3e84e0cda62870311908ba4553ea..7caf9ca714ec77f2d6b156441a88fd214833637d 100644 (file)
@@ -36,7 +36,9 @@ echo "OperatingSystem = $OperatingSystem"
         echo "Please enter the root passwd to add necessary packages:"; 
         if [ "Ubuntu" == $OperatingSystem ] ; then
            sudo bash ThirdParty-install-Base-rpm.sh $OperatingSystem
-       else
+        elif [ "MacOS" == $OperatingSystem ] ; then
+           sudo bash ThirdParty-install-Base-rpm.sh $OperatingSystem
+               else
            su -c "bash ThirdParty-install-Base-rpm.sh $OperatingSystem"   
         fi 
     fi
index 4439ccbd176a70a07039d606f993d7f1828dc7be..465a1ee74e2ac0d300f07020b3bbe6d0d130445c 100644 (file)
@@ -74,13 +74,14 @@ then
      yum install graphviz             -y
      yum install texlive              -y
      yum install latex2html           -y
-     yum install wxGTK-devel wxBase   -y
+     yum install wxGTK3-devel wxBase3 -y
      yum install boost-devel          -y
      yum install sqlite-devel         -y
      yum install qt-devel             -y
      yum install mesa-libOSMesa-devel -y
      yum install gcc                  -y
      yum install gcc-c++              -y
+     yum install make                 -y
      yum install redhat-rpm-config    -y
      yum install xerces-c-devel       -y
      yum install git                  -y
@@ -145,27 +146,27 @@ then
      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 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 "
index 83e2569951ff26e6deef6fad56ef928399ad051c..9adf1ab286f7c7e63930c0fcf93a1a56813254bf 100644 (file)
@@ -44,9 +44,9 @@ echo "=================================== in ThirdParty-install-Finalize.sh ETC_
 # /// \TODO move theese ones upper in the process!  JPR
 
 export GDCM_DIR=$installPrefixThird/lib/gdcm/
-export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
-export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
-export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
+export VTK_DIR=$installPrefixThird/lib/cmake/vtk-8.1/
+export ITK_DIR=$installPrefixThird/lib
+export WT_DIR=$installPrefixThird/lib/wt-4.0.4-rc1/
 
 baseLibraryThirdPartyDir=$installPrefixThird/share/creatools
 
@@ -65,12 +65,14 @@ fi
 touch     $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 chmod 755 $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 
-echo installPrefixThird='$1'                                                                                           >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-echo export PATH='$'PATH:'$'installPrefixThird/bin             >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-echo export VTK_DIR='$'installPrefixThird/lib/vtk-5.10         >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-echo export ITK_DIR='$'installPrefixThird/lib/InsightToolkit   >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export GDK_BACKEND=x11                                                            >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export MESA_GL_VERSION_OVERRIDE=3.2                               >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo installPrefixThird='$1'                                                                           >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export PATH='$'PATH:'$'installPrefixThird/bin                     >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export VTK_DIR='$'installPrefixThird/lib                          >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export ITK_DIR='$'installPrefixThird/lib                                  >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 echo export GDCM_DIR='$'installPrefixThird/lib/gdcm            >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-echo export WT_DIR='$'installPrefixThird/lib/wt-3.3.4                  >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export WT_DIR='$'installPrefixThird/lib/wt-4.0.4-rc1              >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 echo export TTH='$'installPrefixThird/bin/tth                  >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 
 if [ $OperatingSystem = "MacOS" ]
@@ -78,12 +80,12 @@ then
    echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'GDCM_DIR   >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
    echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'ITK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
    echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'VTK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'WT_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'WT_DIR        >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 else
-   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'GDCM_DIR   >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'ITK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'VTK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'WT_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'GDCM_DIR          >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'ITK_DIR           >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'VTK_DIR           >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'WT_DIR                    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 fi
 
 cd $PWD/scripts
index 91e06a75958320ed91ead68b4dd6a283bac59dda..c063cbddd3e292705d1bc979cb00bcc489f6e70d 100644 (file)
@@ -75,7 +75,7 @@ source $PWD/scripts/CreaTools-configure.sh
   then
        stdCompiler=c++98
   else
-       stdCompiler=c++03
+       stdCompiler=c++11
   fi
 
 
@@ -119,33 +119,39 @@ fi
   fi
   cd $sourcesDir
 
- echo "we download new stuff"
-  if [ $ITKVersion = ITK3 ]
-  then
-     # deal with ITK3
-     #EED itkfile=InsightToolkit-3.20.0.patchCreatis.tar.gz
-     #EED libname=InsightToolkit-3.20.0
-
-     #EED itkfile=InsightToolkit-3.20.1.tar.gz
-     #EED libname=InsightToolkit-3.20.1
-
-     itkfile=InsightToolkit-3.20.1-patchCreatis.tgz
-     libname=InsightToolkit-3.20.1-patchCreatis
-
-  else
-    # deal with ITK4
-    itkfile=ITK4.0.tgz
-    libname=ITK
-  fi
-
-  if [ $OperatingSystem = "MacOS" ]
-    then
-      curl -O http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/$itkfile
-  else
-##EED19mai2015      wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/$itkfile
-      wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/$itkfile
-  fi
-  tar -xzvf $itkfile
+##  if [ $ITKVersion = ITK3 ]
+##  then
+##     # deal with ITK3
+##     #EED itkfile=InsightToolkit-3.20.0.patchCreatis.tar.gz
+##     #EED libname=InsightToolkit-3.20.0
+##
+##     #EED itkfile=InsightToolkit-3.20.1.tar.gz
+##     #EED libname=InsightToolkit-3.20.1
+##
+##     itkfile=InsightToolkit-3.20.1-patchCreatis.tgz
+##     libname=InsightToolkit-3.20.1-patchCreatis
+##
+##  else
+##    # deal with ITK4
+##    itkfile=InsightToolkit-4.13.1.zip
+##    libname=InsightToolkit-4.13.1
+##  fi
+
+    itkfile=InsightToolkit-5.0.1.zip
+    libname=InsightToolkit-5.0.1
+
+
+##  if [ $OperatingSystem = "MacOS" ]
+##    then
+##      curl -O http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/$itkfile
+##  else
+## ##EED19mai2015      wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/$itkfile
+##      wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/$itkfile
+## ##  tar -xzvf $itkfile
+##  fi
+
+  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/$itkfile
+  unzip  $itkfile
 
 
 #fi # JPR ------------1
@@ -170,11 +176,26 @@ 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
-  if [ $ITKVersion = ITK4 ]
-  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        
-  fi
+
+  cmake -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt
+##  if [ $ITKVersion = ITK3 ]
+##  then
+##    cmake -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
+##  fi
+
+##  if [ $ITKVersion = ITK4 ]
+##  then
+
+## ##EED ITK4.0
+## #     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
+## # -D ITK_USE_SYSTEM_GDCM=ON
+##     cmake -D ITKV3_COMPATIBILITY:BOOL=ON -D Module_ITKReview:BOOL=ON  CMakeCache.txt        
+##
+##  fi
+
+  cmake -D Module_ITKReview:BOOL=ON  CMakeCache.txt        
   cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt
 
   #uncomment following line if you want to use the bleeding edge of GDCM2!
index c8b269ca1b5d0ecbdbc3801d3b6a059457ecce15..a8ad7f4f1e97941de90efa932e290b25234af419 100644 (file)
@@ -64,17 +64,18 @@ source $PWD/scripts/CreaTools-configure.sh
    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
+#  else
+#      stdCompiler=c++03
   fi
 
 
-
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
 binDir=$generationdir/thirdparty_bin
@@ -110,43 +111,47 @@ fi
   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
-
-  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
-  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 
-
- 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
 
 
 #if [ $buildType = "Debug" ]
@@ -156,17 +161,57 @@ pwd
 #   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-8.1.1
+  libnameB=vtk-8.1
   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/$libnameB/
 
   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/$libnameB/
   cd $dirInstall
 
 # See EED why we have to do this
@@ -174,22 +219,29 @@ then
   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 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
 
-  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 VTK_Group_Views:BOOL=ON -D VTK_Group_Qt:BOOL=OFF CMakeCache.txt  
 
-##EED 2016-12-22  make -j $corenumber
   make -j $corenumber
   make -j $corenumber install
   cd ..
+
 fi
+
+
+
+
+
index 9ddfaefad8ff82b2ce635c04efa083ee3d9f2591..ea5fc673fac66378e5a5371cdd54c86f6b75591d 100644 (file)
@@ -99,18 +99,21 @@ fi
   cd $sourcesDir
 
  echo "we download new stuff"
- if [ $OperatingSystem = "MacOS" ]
- then
-
-  curl -O http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-3.3.4.tar.gz
-  tar -xvzf wt-3.3.4.tar.gz
-  # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
- else
-  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-3.3.4.tar.gz
-  echo tar -xvzf wt-3.3.4.tar.gz
-  pwd
-  tar -xvzf wt-3.3.4.tar.gz
- fi
+##  if [ $OperatingSystem = "MacOS" ]
+##  then
+## #  curl -O http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-3.3.4.tar.gz
+## #  tar -xvzf wt-3.3.4.tar.gz
+##   curl -O http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-4.0.4-rc1.tar.gz
+##   tar -xvzf wt-4.0.4-rc1.tar.gz
+##   # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
+##  else
+## #  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-3.3.4.tar.gz
+## #  tar -xvzf wt-3.3.4.tar.gz
+## fi
+
+  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-4.0.4-rc1.tar.gz
+  tar -xvzf wt-4.0.4-rc1.tar.gz
 
 
 #if [ $buildType = "Debug" ]
@@ -124,13 +127,14 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=wt-3.3.4
+##  libname=wt-3.3.4
+  libname=wt-4.0.4-rc1
   dirInstall=$binDir/$libname-Bin
-##  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
-  export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
+##  export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
+  export WT_DIR=$installPrefixThird/lib/$libname
 
   mkdir -p $dirInstall
-  echo "we prepare directories dirInstall " $dirInstall  " WT_DIR " $installPrefixThird/lib/wt-3.3.4/
+  echo "we prepare directories dirInstall " $dirInstall  " WT_DIR " $installPrefixThird/lib/$libname/
   cd $dirInstall
 
 # See EED why we have to do this
@@ -141,8 +145,8 @@ 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 LIB_INSTALL_DIR:PATH=lib/$libname -D ENABLE_EXT:BOOL=true ENABLE_MYSQL:BOOL=false CMakeCache.txt
-  cmake -D BUILD_TESTS:BOOL=false CMakeCache.txt
+  cmake -D LIB_INSTALL_DIR:PATH=lib/$libname -D ENABLE_EXT:BOOL=ON ENABLE_MYSQL:BOOL=OFF CMakeCache.txt
+  cmake -D BUILD_TESTS:BOOL=OFF CMakeCache.txt
 #  if [ $OperatingSystem = "MacOS" ]
 #  then
 #     ###
@@ -150,5 +154,6 @@ then
 
   make -j $corenumber
   su -c 'make install'
+  sudo make install
   cd ..
 fi
index b3aa011fc3f5a6ba3f08fe2226a249d3d5b99791..11725e913d8f302346ffc2dd2b7282c008cee0c7 100644 (file)
@@ -44,8 +44,8 @@ source $PWD/scripts/CreaTools-configure.sh
   if [ `getDistrib` == "CentOS" ] && [ `getKernelVersion` < "2.6.34" ]
   then
        stdCompiler=c++98
-  else
-       stdCompiler=c++03
+#  else
+#      stdCompiler=c++11
   fi
 
 
@@ -106,16 +106,25 @@ fi
   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
-     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
- fi
+  
+##  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
+## 
+## ##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 gdcm13_2018_05_28_vtk8.tar.gz
+##  fi
+
+    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm13_2019_06_17_vtk8.zip
+       unzip gdcm13_2019_06_17_vtk8.zip
 
 if [ $buildType = "Debug" ]
 then
@@ -128,7 +137,7 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=gdcm
+  libname=gdcm13
   dirInstall=$binDir/$libname-Bin
   export GDCM_DIR=$installPrefixThird/lib/gdcm/
   mkdir -p $dirInstall
diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh-NEW_gdcm2 b/Linux/scripts/ThirdParty-install-gdcm.sh-NEW_gdcm2
new file mode 100644 (file)
index 0000000..e2e8789
--- /dev/null
@@ -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
+
index 8fe9df0874ccdda0fd179d9d69403a3f8caf79c6..a88a65e72056122b99fd6dce47279944527106b7 100644 (file)
@@ -33,7 +33,8 @@ echo $2
 echo $3
 echo $4
 
-make -j $4
+#let halfProcessors=$( $4/2 )
+make -j $4 $5
 
 # We don't install immediately!
 
index 26da6307e09fec71b58f66d208578e2a5a5f29e0..5156a7de467e05661daba5b9b2463294a1a5a22c 100644 (file)
@@ -32,6 +32,13 @@ currentdir=$2
 binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
+ if [ $OperatingSystem = "MacOS" ]
+  then
+     cmake -D  CMAKE_CXX_COMPILER:FILE=/usr/bin/g++
+     
+##    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ 
+     
+  fi
 
 cmake -D CMAKE_CXX_FLAGS:STRING=-fPIC -D CMAKE_CXX_FLAGS:STRING=-fopenmp       CMakeCache.txt
 cmake -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin                               CMakeCache.txt
index e674dce6ccf41f0c28e956a65fc7260072e9a03f..0f349678ff5ba0738a6e2de6a5f8f2858b02aac9 100644 (file)
 binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
-cmake -D CMAKE_CXX_FLAGS:STRING=-fPIC  -D CREA_BUILD_VTK:BOOL=ON -D CREA_BUILD_WX:BOOL=ON CMakeCache.txt
+
+if [[ "$OSTYPE" == "linux-gnu" ]]; then
+  cxxFlags='-fPIC' 
+elif [[ "$OSTYPE" == "darwin" ]]; then
+  cxxFlags='-fPIC -ObjC++C'
+fi
+
+
+cmake -D CMAKE_CXX_FLAGS:STRING=$cxxFlags  -D CREA_BUILD_VTK:BOOL=ON -D CREA_BUILD_WX:BOOL=ON CMakeCache.txt
 cmake CMakeCache.txt
 cmake CMakeCache.txt
 
index c9ee2babdc25335d280152a394ff96f223af5605..a03f86d9e20f0add11bfd4c840bd267001632fa5 100644 (file)
@@ -32,7 +32,7 @@ currentdir=$2
 binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
-cmake -D CMAKE_CXX_FLAGS:STRING=-fPIC                       CMakeCache.txt
+cmake -D CMAKE_CXX_FLAGS:STRING=-fPIC  -fopenmp             CMakeCache.txt
 cmake -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin    CMakeCache.txt
 cmake -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin    CMakeCache.txt
 cmake -D BUILD_BBTK_PACKAGE_creaVtk:BOOL=ON                    CMakeCache.txt
index c3d4b2283d2306f8beee5fbcde13f830bb404a87..a1db560884b6cc26ecaa7491663db8396c6d22c2 100644 (file)
@@ -41,6 +41,7 @@ installPrefix=$4
 # We install, now
 
 pwd
+make -j $5 install
 make install
 
 if [ -e $installPrefix/lib64 ]