3405 vtk8itk5wx3-macos

diff --git a/Linux/installscript b/Linux/installscript
index 65a5ae4c11e2532cd8e082faef15b234f65a7808..9e4cc33d3d034301f886ee301eae2e42c88a883a 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -249,7 +249,7 @@ fi
 # install packaged dependencies as root
 if [ `checkVal $command all 3rd 3rd-base` == true ] ; then
     bigDisplay "INSTALL PACKAGES DEPENDENCIES"
-    source scripts/CreaTools-configure.sh
+    bash scripts/CreaTools-configure.sh
     cd scripts
     source ThirdParty-install-Base-Stuff.sh $OperatingSystem
     cd ..
@@ -259,14 +259,14 @@ fi
 # vtk
 if [ `checkVal $command all 3rd 3rd-vtk` == true ] ; then
     bigDisplay "INSTALL VTK"
-    source scripts/ThirdParty-install-VTK.sh
+##EED    source scripts/ThirdParty-install-VTK.sh
     cd $scriptDirName
 fi
 
 # gdcm
 if [ `checkVal $command all 3rd 3rd-gdcm` == true ] ; then
     bigDisplay "INSTALL $gdcmVersion"
-    source scripts/ThirdParty-install-gdcm.sh
+    bash scripts/ThirdParty-install-gdcm.sh
     pwd
     echo $scriptDirName 
     cd $scriptDirName
@@ -282,7 +282,7 @@ fi
 # wt
 if [ `checkVal $command all 3rd 3rd-wt` == true ] ; then
     bigDisplay "INSTALL WT"
-    source scripts/ThirdParty-install-WT.sh
+    bash scripts/ThirdParty-install-WT.sh
     cd $scriptDirName
 fi
 

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index da95206ff313913c730c7871256b9add856da189..ae1503e2913d4d51477b0b3abef5876b99b6bd78 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -147,6 +147,8 @@ then
          git checkout vtk8itk5wx3-macos
          cd $generationdir/creatools_source/$creaminitoolssource
          git checkout vtk8itk5wx3-macos
+         cd $generationdir/creatools_source/$creatoolstoolssource
+         git checkout vtk8itk5wx3-macos
       fi
 
       if [ $sourcesFrom = HTML ]

diff --git a/Linux/scripts/ThirdParty-install-Base-rpm.sh b/Linux/scripts/ThirdParty-install-Base-rpm.sh
index fa230354a2a7f3b27ebbd976045d21217d61880e..f247a065b5dd1e5dd15127bd59955073603d131d 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Base-rpm.sh
+++ b/Linux/scripts/ThirdParty-install-Base-rpm.sh
@@ -148,8 +148,10 @@ then
      ;; 
   MacOS)
      port selfupdate
-     port -N install cairo                 -y
-     port -N install libomp                 -y
+     port -N install cairo                -y
+     port -N install libomp               -y
+#     port -f activate libomp              -y
+     port -f activate libomp-devel        -y
      port -N install wget                 -y
      port -N install cmake                -y
      port -N install doxygen              -y

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index 6c53b48da377ebef1d04cc7f6aa855b6c2a16b20..19edf304d4d87533c10d315b513e2c7d8a2a3a9d 100644 (file)
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -38,10 +38,7 @@
    echo
    exit 0
 fi
-echo $PWD/scripts/CreaTools-configure.sh
-echo --- beg
-more $PWD/scripts/CreaTools-configure.sh
-echo --- end
+
 source $PWD/scripts/CreaTools-configure.sh
 
    echo "------"