cf EED : http://www.creatis.insa-lyon.fr/site/fr/CreatoolsInstallInstructionsv2.0...

diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index 9211a45b33b07da7ada5128e380bc9756720105d..9647691dfda275f166eae1565295c3d839ba10a3 100644 (file)
--- a/Linux/scripts/ThirdParty-install.sh
+++ b/Linux/scripts/ThirdParty-install.sh
@@ -114,15 +114,15 @@ then
      port install cmake                -y
      port install doxygen              -y
      port install graphviz             -y
-     port install tetex                -y   # cf EED : http://www.creatis.insa-lyon.fr/site/fr/CreatoolsInstallInstructionsv2.0.1MacOsv10.5.6-Developpers
+    # 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    /usr/local/lib # cf EED : http://www.creatis.insa-lyon.fr/site
-        ln -s libboost_signals-xgcc40-mt-1_38.dylib    libboost_signals.dylib    /usr/local/lib # cf EED
-        ln -s libboost_filesystem-xgcc40-mt-1_38.dylib libboost_filesystem.dylib /usr/local/lib # cf EE
-        ln -s libboost_system-xgcc40-mt-1_38.dylib     libboost_system.dylib     /usr/local/lib # cf EE 
+        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
@@ -142,6 +142,7 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
+  echo "we remove old stuff"
   rm -rf $sourcesDir/VTK*
   rm -rf $sourcesDir/vtk*
   rm -rf $sourcesDir/InsightToolkit*
@@ -198,7 +199,13 @@ 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 USE_DEBUG_LIB:BOOL=$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=ON  CMakeCache.txt
+    cmake -D  VTK_USE_TCL:BOOL=OFF  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
   make -j $corenumber
   make install