From: Eduardo DAVILA <davila@creatis.insa-lyon.fr>
Date: Wed, 15 Sep 2021 11:22:23 +0000 (+0200)
Subject: 3405 vtk8itk5wx3-macos
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=82794d262c5db3f312b1a2c9b061597a17079e02;p=creaToolsTools.git

3405 vtk8itk5wx3-macos
---

diff --git a/Linux/installscript b/Linux/installscript
index 65a5ae4..9e4cc33 100755
--- 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 da95206..ae1503e 100644
--- 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 fa23035..f247a06 100644
--- 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 6c53b48..19edf30 100644
--- 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 "------"