macInstall

diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index 5209b995657c412a6575d96663f1b445ee537008..cd2705255d9c598dab349ca28104ff12c39c1993 100644 (file)
--- a/Linux/scripts/ThirdParty-install.sh
+++ b/Linux/scripts/ThirdParty-install.sh
@@ -12,6 +12,7 @@
    echo
    exit 0
 fi 
+echo $loginGroupName
 
 source $PWD/scripts/CreaTools-configure.sh
 
@@ -52,13 +53,11 @@ fi
 if [ ! -e $sourcesDir ]
 then
    mkdir $sourcesDir
-   chown $loginUserName:$loginGroupName $sourcesDir   
 fi
 
 if [ ! -e $binDir ]
 then
    mkdir $binDir
-   chown $loginUserName:$loginGroupName $binDir     
 fi
 
 
@@ -104,22 +103,21 @@ then
      ;;
   MacOS)
 # QUESTION : is -y  mandatory?
-
+     port selfupdate
      port install cmake -y 
-     port install cmake-gui -y 
      port install doxygen -y
      port install graphviz -y
      port install texlive -y
      port install latex2html -y
-     port install wxGTK-devel wxBase -y
-     port install boost-devel -y
-     port install sqlite-devel -y
-     port install qt-devel -y
-     port install mesa-libOSMesa-devel -y
+     port install wxGTK -y
+     port install boost -y
+     port install sqlite3 -y
+     port install qt4-mac -y
+     port install mesa -y
      ;;
   *)
      #echo " '$OperatingSystem' : Unknown (for us...) Operating Sytem "
-     echo " Allowed values are (right now) Fedora, Ubuntu, MacOS "
+    echo " Allowed values are (right now) Fedora, Ubuntu, MacOS "
      exit 0
      ;;
   esac             
@@ -141,25 +139,30 @@ then
   rm -rf $binDir/InsightToolkit*
   rm -rf $binDir/VTK*
   cd $sourcesDir
-  
  if [ $OperatingSystem = "MacOS" ]
  then    
-  curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
-  curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
-  curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
-  curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_Developer_Tools/All_Versions/tth/tth_linux/tth
+  curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
+  curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
+  curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
+  curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_Developer_Tools/All_Versions/tth/tth_linux/tth
+
+  tar -xvf VTK-5.6.1.patchCreatis.tar.gz
+  tar -xvf gdcm_05_Mai_2011.tar.gz
+  tar -xvf InsightToolkit-3.20.0.tar.gz
+
 else
   wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
   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/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
   wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_Developer_Tools/All_Versions/tth/tth_linux/tth
-fi  
   
   tar -xvzf VTK-5.6.1.patchCreatis.tar.gz
   tar -xvzf gdcm_05_Mai_2011.tar.gz
   tar -xvzf InsightToolkit-3.20.0.tar.gz
 fi
 
+fi
+
 
 if [ $buildType = "Debug" ]
 then
@@ -221,7 +224,7 @@ then
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   cmake -D USE_DEBUG_LIB:BOOL=$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 -D ITK_USE_REVIEW_STATISTICS:BOOL=ON 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
   #uncomment following line if you want to use the bleeding edge of GDCM2!
   #cmake -D ITK_USE_SYSTEM_GDCM:BOOL=ON CMakeCache.txt
   cmake CMakeCache.txt
@@ -234,7 +237,7 @@ fi
 if [ true = true ]
 then
   cd $sourcesDir
-  cp tth $installPrefixThird/bin
+ # cp tth $installPrefixThird/bin
 fi
 
 
@@ -299,8 +302,3 @@ fi
 # - add line 'bash $installPrefixThird/share/creatools_third_party_library_config.sh' (with accurate value for ???)
 echo installPrefixThird=$installPrefixThird >> $ETC_BASHRC
 echo '[ -f "$installPrefixThird/share/creatools_third_party_library_config.sh" ] &&  source $installPrefixThird/share/creatools_third_party_library_config.sh' >> $ETC_BASHRC 
-
-
-
- chown -R $loginUserName:$loginGroupName $generationdir
-