#3126 creaToolsTools Feature New Normal - branch changeWx28to30 compilation with...

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index d85a4b4589871f2c61f1c32a61dd7d521842a450..bfb7cfcfed26adc10f09b670723dd5e98307a6d1 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -122,6 +122,12 @@ then
          bash $scriptDir/gitclone.sh $creatoolstoolssource         $generationdir      $sourcesFrom
  #       bash $scriptDir/cvscheckout.sh $libidosource-ESRF         $generationdir   $cvsUserName
  #            mv $libidosource-ESRF $libidosource               
+
+       cd $generationdir/creatools_source/$creasource
+       git checkout changeWx28to30
+
+
+
       fi
 
       if [ $sourcesFrom = HTML ]

diff --git a/Linux/scripts/ThirdParty-install-Base-rpm.sh b/Linux/scripts/ThirdParty-install-Base-rpm.sh
index 4439ccbd176a70a07039d606f993d7f1828dc7be..2b3072a6fea1995cedc48f447f9a84d192e6e6d7 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Base-rpm.sh
+++ b/Linux/scripts/ThirdParty-install-Base-rpm.sh
@@ -74,7 +74,7 @@ then
      yum install graphviz             -y
      yum install texlive              -y
      yum install latex2html           -y
-     yum install wxGTK-devel wxBase   -y
+     yum install wxGTK3-devel wxBase3 -y
      yum install boost-devel          -y
      yum install sqlite-devel         -y
      yum install qt-devel             -y