#3405 vtk8itk5wx3-macos

diff --git a/Linux/installscript b/Linux/installscript
index b7c2f492c9209ee9dd3f42ab0e1f1a398675e40a..65a5ae4c11e2532cd8e082faef15b234f65a7808 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -23,7 +23,17 @@
 
 #!/bin/bash -e
 
-scriptDirName=$(dirname $(readlink -f $0) )
+
+#This code is Mac
+function EEDreadlink() {
+  DIR="${1%/*}"
+  (cd "$DIR" && echo "$(pwd -P)")
+}
+
+
+#EED 2120-08-25  This code is not working in MacOS so we use EEDreadlink()
+#EED scriptDirName=$(dirname $(Ereadlink -f $0) )
+scriptDirName=$(dirname $(Ereadlink  $0) )/Linux
 
 #########################################################################
 ############     Local Functions  #######################################
@@ -257,6 +267,8 @@ fi
 if [ `checkVal $command all 3rd 3rd-gdcm` == true ] ; then
     bigDisplay "INSTALL $gdcmVersion"
     source scripts/ThirdParty-install-gdcm.sh
+    pwd
+    echo $scriptDirName 
     cd $scriptDirName
 fi
 

diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index 5bbc220bd0cbe8196d0684e10ad88b19f0c9b1e5..b477600c1e9fd995e4e10b16335b2df3be605d83 100644 (file)
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -151,10 +151,8 @@ fi
 ## 
 ##  fi
 
-       wget https://www.vtk.org/files/release/8.2/VTK-8.2.0.zip
-       unzip VTK-8.2.0.zip
-
-
+  wget https://www.vtk.org/files/release/8.2/VTK-8.2.0.zip
+  unzip VTK-8.2.0.zip
 
 #if [ $buildType = "Debug" ]
 #then
@@ -220,6 +218,7 @@ then
   if [ $OperatingSystem = "MacOS" ]
   then
      cmake -D  CMAKE_CXX_COMPILER:FILE=/usr/bin/g++
+  echo
   fi
 
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
@@ -231,6 +230,7 @@ then
     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
+   echo
   fi
 
   cmake -D VTK_Group_Views:BOOL=ON  -D VTK_Group_Qt:BOOL=ON   CMakeCache.txt

diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index d067f6b7f38abd3af4d4e6cd5810e5a7e9235f11..52ea4b60b513a43ae20ce9e0993c105783af8a3a 100644 (file)
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -125,6 +125,7 @@ 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" ]