From: Eduardo DAVILA <davila@creatis.insa-lyon.fr>
Date: Tue, 21 Apr 2020 05:51:27 +0000 (+0200)
Subject: #3401 creaToolsTools Feature New Normal  -  vtk9itk4wx3-macos
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=refs%2Fheads%2Fvtk9itk4wx3-macos;p=creaToolsTools.git

#3401 creaToolsTools Feature New Normal  -  vtk9itk4wx3-macos
---

diff --git a/Linux/README.txt b/Linux/README.txt
index 8d61023..63a67ad 100644
--- a/Linux/README.txt
+++ b/Linux/README.txt
@@ -230,6 +230,29 @@ E) Open a new terminal window.
 
 
 
+===============================================================
+===============================================================
+===============================================================
+===============================================================
+
+
+2020-03-20
+-- Update macport
+https://trac.macports.org/wiki/Migration
+	xcode-select --install
+
+	-MacPort install last version
+	https://www.macports.org/install.php
+
+
+/opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.0/bin/wx-config
+/opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.0/bin/wxrc-3.0
+
+/opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxGTK/3.0/bin/wx-config
+/opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxGTK/3.0/bin/wxrc-3.0
+
+
+/Users/davila/Creatis/C9/tpli/lib/cmake/vtk-8.2
 ===============================================================
 ===============================================================
 ===============================================================
@@ -271,13 +294,24 @@ NSView
 https://groups.google.com/forum/#!topic/wx-users/3EpM_oTUST8
 
 
+
+port install  libGLU
 port install  gdk-pixbuf2 -x11
 port install cairo +quartz
 port install pango +quartz
 port install gtk3 +quartz -x11
 port install wxgtk-3.0 +quartz -x11
 
+port install  gtk-osx-application-gtk3
+-------
+
+port install cmake
+port install boost
+port install wxgtk-3.0
+
+commontair in  creaRTTI.cxx :  run_time_up_or_down_cast.    --->>> abi::__class_type_info
 
+-----------------------------------------------
 
 wxWidgets-3.0  wxWidgets-common, wxWidgets_select
 
diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index 863e964..b1be3b8 100644
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -124,25 +124,25 @@ then
  #	 mv $libidosource-ESRF $libidosource	 	 
           
          cd $generationdir/creatools_source/$creasource
-		 git checkout vtk8itk4wx3-mingw64
+		 git checkout vtk9itk4wx3-macos
          cd $generationdir/creatools_source/$bbtksource
-		 git checkout vtk8itk4wx3-mingw64
+		 git checkout vtk9itk4wx3-macos
          cd $generationdir/creatools_source/$creavtksource
-		 git checkout vtk8itk4wx3-mingw64
+		 git checkout vtk9itk4wx3-macos
          cd $generationdir/creatools_source/$creamaracassource
-		 git checkout vtk8itk4wx3-mingw64
+		 git checkout vtk9itk4wx3-macos
+		 cd $generationdir/creatools_source/$creabrukersource
+		 git checkout vtk9itk4wx3-macos
          cd $generationdir/creatools_source/$creaimagesource
-		 git checkout vtk8itk4wx3-mingw64
+		 git checkout vtk9itk4wx3-macos
          cd $generationdir/creatools_source/$creacontourssource
-		 git checkout vtk8itk4wx3-mingw64
+		 git checkout vtk9itk4wx3-macos
          cd $generationdir/creatools_source/$crearigidregistrationssource
-		 git checkout vtk8itk4wx3-mingw64
+		 git checkout vtk9itk4wx3-macos
          cd $generationdir/creatools_source/$bbtkgeditorsource
-		 git checkout vtk8itk4wx3-mingw64
+		 git checkout vtk9itk4wx3-macos
          cd $generationdir/creatools_source/$creatoolssource
-		 git checkout vtk8itk4wx3-mingw64
-		 cd $generationdir/creatools_source/$creabrukersource
-		 git checkout vtk8itk4wx3-mingw64
+		 git checkout vtk9itk4wx3-macos
       fi
 
       if [ $sourcesFrom = HTML ]
diff --git a/Linux/scripts/ThirdParty-install-Base-rpm.sh b/Linux/scripts/ThirdParty-install-Base-rpm.sh
index 25ddfa4..fa23035 100644
--- a/Linux/scripts/ThirdParty-install-Base-rpm.sh
+++ b/Linux/scripts/ThirdParty-install-Base-rpm.sh
@@ -148,6 +148,8 @@ then
      ;; 
   MacOS)
      port selfupdate
+     port -N install cairo                 -y
+     port -N install libomp                 -y
      port -N install wget                 -y
      port -N install cmake                -y
      port -N install doxygen              -y
diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index e2f2679..5bbc220 100644
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -151,8 +151,8 @@ fi
 ## 
 ##  fi
 
- 	wget https://www.vtk.org/files/release/8.1/VTK-8.1.1.zip
- 	unzip VTK-8.1.1.zip
+ 	wget https://www.vtk.org/files/release/8.2/VTK-8.2.0.zip
+ 	unzip VTK-8.2.0.zip
 
 
 
@@ -206,8 +206,8 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=VTK-8.1.1
-  libnameB=vtk-8.1
+  libname=VTK-8.2.0
+  libnameB=vtk-8.2
   dirInstall=$binDir/$libname-Bin
 ##  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
   export VTK_DIR=$installPrefixThird/lib/cmake/$libnameB/