#3405 creaToolsTools Feature New Normal - vtk8itk5wx3-macos

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index 7797dce4d2902446c791d4942b42df4c5d028352..3cab2f5d72342c7eabcbe7f92a21e5aa0e147013 100644 (file)
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -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

diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh
index c75afa726d94204169b3977213b82c5d7ea7efed..33af6db1173f3f9d50d3e7d0fadeeca9d2122eeb 100644 (file)
--- a/Linux/scripts/CreaTools-install.sh
+++ b/Linux/scripts/CreaTools-install.sh
@@ -65,18 +65,18 @@
   #  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

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index d85a4b4589871f2c61f1c32a61dd7d521842a450..57122327f743f00b05219d28d99e2b90f8e14d8b 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -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,28 @@ 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-macos
+         cd $generationdir/creatools_source/$bbtksource
+                git checkout vtk8itk5wx3-macos
+         cd $generationdir/creatools_source/$creavtksource
+                git checkout vtk8itk5wx3-macos
+         cd $generationdir/creatools_source/$creamaracassource
+                git checkout vtk8itk5wx3-macos
+                cd $generationdir/creatools_source/$creabrukersource
+                git checkout vtk8itk5wx3-macos
+         cd $generationdir/creatools_source/$creaimagesource
+                git checkout vtk8itk5wx3-macos
+         cd $generationdir/creatools_source/$creacontourssource
+                git checkout vtk8itk5wx3-macos
+         cd $generationdir/creatools_source/$crearigidregistrationssource
+                git checkout vtk8itk5wx3-macos
+         cd $generationdir/creatools_source/$bbtkgeditorsource
+                git checkout vtk8itk5wx3-macos
+         cd $generationdir/creatools_source/$creatoolssource
+                git checkout vtk8itk5wx3-macos
       fi
 
       if [ $sourcesFrom = HTML ]

diff --git a/Linux/scripts/LocalFunctions.sh b/Linux/scripts/LocalFunctions.sh
index 084c2a19c4dc790a5280f2023c8dd2aff79722a3..662fbae0d65c126df57ced28728e28c141813ad4 100644 (file)
--- a/Linux/scripts/LocalFunctions.sh
+++ b/Linux/scripts/LocalFunctions.sh
@@ -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

diff --git a/Linux/scripts/ThirdParty-install-Base-Stuff.sh b/Linux/scripts/ThirdParty-install-Base-Stuff.sh
index 088e02b4c8ec3e84e0cda62870311908ba4553ea..7caf9ca714ec77f2d6b156441a88fd214833637d 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Base-Stuff.sh
+++ b/Linux/scripts/ThirdParty-install-Base-Stuff.sh
@@ -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

diff --git a/Linux/scripts/ThirdParty-install-Base-rpm.sh b/Linux/scripts/ThirdParty-install-Base-rpm.sh
index 4439ccbd176a70a07039d606f993d7f1828dc7be..fa230354a2a7f3b27ebbd976045d21217d61880e 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Base-rpm.sh
+++ b/Linux/scripts/ThirdParty-install-Base-rpm.sh
@@ -74,7 +74,7 @@ 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
@@ -145,27 +145,29 @@ 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 cairo                 -y
+     port -N install libomp                 -y
+     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 "

diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh
index 83e2569951ff26e6deef6fad56ef928399ad051c..9adf1ab286f7c7e63930c0fcf93a1a56813254bf 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@ -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

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index 91e06a75958320ed91ead68b4dd6a283bac59dda..6c53b48da377ebef1d04cc7f6aa855b6c2a16b20 100644 (file)
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -75,7 +75,7 @@ source $PWD/scripts/CreaTools-configure.sh
   then
        stdCompiler=c++98
   else
-       stdCompiler=c++03
+       stdCompiler=c++11
   fi
 
 
@@ -120,32 +120,39 @@ 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
+#  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
 
-     #EED itkfile=InsightToolkit-3.20.1.tar.gz
-     #EED libname=InsightToolkit-3.20.1
+    itkfile=InsightToolkit-5.0.1.zip
+    libname=InsightToolkit-5.0.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
+## ##  tar -xzvf $itkfile
+##  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
+  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/$itkfile
+  unzip  $itkfile
 
 
 #fi # JPR ------------1
@@ -170,12 +177,23 @@ 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 CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt
+  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!
   #cmake -D ITK_USE_SYSTEM_GDCM:BOOL=ON CMakeCache.txt

diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index c8b269ca1b5d0ecbdbc3801d3b6a059457ecce15..5bbc220bd0cbe8196d0684e10ad88b19f0c9b1e5 100644 (file)
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -64,6 +64,8 @@ source $PWD/scripts/CreaTools-configure.sh
    echo "------"
 
 
+ 
+
 #EED 2017-03-24
   source $PWD/scripts/LocalFunctions.sh
   if [ `getDistrib` == "CentOS" ] && [ `getKernelVersion` < "2.6.34" ]
@@ -110,42 +112,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.2/VTK-8.2.0.zip
+       unzip VTK-8.2.0.zip
 
 
 
@@ -156,17 +163,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.2.0
+  libnameB=vtk-8.2
   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 +221,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
+
+
+
+
+

diff --git a/Linux/scripts/ThirdParty-install-WT.sh b/Linux/scripts/ThirdParty-install-WT.sh
index 9ddfaefad8ff82b2ce635c04efa083ee3d9f2591..ea5fc673fac66378e5a5371cdd54c86f6b75591d 100644 (file)
--- a/Linux/scripts/ThirdParty-install-WT.sh
+++ b/Linux/scripts/ThirdParty-install-WT.sh
@@ -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

diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index b3aa011fc3f5a6ba3f08fe2226a249d3d5b99791..d067f6b7f38abd3af4d4e6cd5810e5a7e9235f11 100644 (file)
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -106,16 +106,26 @@ 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_2018_05_28_vtk8.zip
+       unzip gdcm13_2018_05_28_vtk8.zip
+#      mv gdcm13_2018_05_28_vtk8 gdcm
 
 if [ $buildType = "Debug" ]
 then
@@ -128,7 +138,7 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=gdcm
+  libname=gdcm13_2018_05_28_vtk8
   dirInstall=$binDir/$libname-Bin
   export GDCM_DIR=$installPrefixThird/lib/gdcm/
   mkdir -p $dirInstall

diff --git a/Linux/scripts/compilemod.sh b/Linux/scripts/compilemod.sh
index 8fe9df0874ccdda0fd179d9d69403a3f8caf79c6..a88a65e72056122b99fd6dce47279944527106b7 100644 (file)
--- a/Linux/scripts/compilemod.sh
+++ b/Linux/scripts/compilemod.sh
@@ -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!
 

diff --git a/Linux/scripts/creaMaracasVariables.sh b/Linux/scripts/creaMaracasVariables.sh
index 26da6307e09fec71b58f66d208578e2a5a5f29e0..8a80c31da0653c3072e3426cb3d1136bfd692956 100644 (file)
--- a/Linux/scripts/creaMaracasVariables.sh
+++ b/Linux/scripts/creaMaracasVariables.sh
@@ -32,8 +32,16 @@ currentdir=$2
 binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
-
-cmake -D CMAKE_CXX_FLAGS:STRING=-fPIC -D CMAKE_CXX_FLAGS:STRING=-fopenmp       CMakeCache.txt
+ if [ $OperatingSystem = "MacOS" ]
+  then
+     cmake -D  CMAKE_CXX_COMPILER:FILE=/usr/bin/g++
+##    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ 
+    cmake  -D CMAKE_CXX_FLAGS:STRING=-Xpreprocessor -fopenmp   CMakeCache.txt 
+  else 
+    cmake  -D CMAKE_CXX_FLAGS:STRING=-fopenmp  CMakeCache.txt
+  fi
+
+cmake -D CMAKE_CXX_FLAGS:STRING=-fPIC                                       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_creaMaracasVisu:BOOL=ON                                    CMakeCache.txt

diff --git a/Linux/scripts/creaVariables.sh b/Linux/scripts/creaVariables.sh
index e674dce6ccf41f0c28e956a65fc7260072e9a03f..0f349678ff5ba0738a6e2de6a5f8f2858b02aac9 100644 (file)
--- a/Linux/scripts/creaVariables.sh
+++ b/Linux/scripts/creaVariables.sh
@@ -31,7 +31,15 @@
 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
 

diff --git a/Linux/scripts/creaVtkVariables.sh b/Linux/scripts/creaVtkVariables.sh
index c9ee2babdc25335d280152a394ff96f223af5605..a03f86d9e20f0add11bfd4c840bd267001632fa5 100644 (file)
--- a/Linux/scripts/creaVtkVariables.sh
+++ b/Linux/scripts/creaVtkVariables.sh
@@ -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

diff --git a/Linux/scripts/installmod.sh b/Linux/scripts/installmod.sh
index c3d4b2283d2306f8beee5fbcde13f830bb404a87..a1db560884b6cc26ecaa7491663db8396c6d22c2 100644 (file)
--- a/Linux/scripts/installmod.sh
+++ b/Linux/scripts/installmod.sh
@@ -41,6 +41,7 @@ installPrefix=$4
 # We install, now
 
 pwd
+make -j $5 install
 make install
 
 if [ -e $installPrefix/lib64 ]