#3133 creaToolsTools Feature New Normal - branch vtk7itk4wx3 wxWidgets3

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index ab1395163b048cbb8431a3cb13eb665a85fc758e..90a9d4c657497a8554a0a2ae003a78ff91a4bc55 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -121,7 +121,7 @@ then
          bash $scriptDir/gitclone.sh $creaminitoolssource          $generationdir      $sourcesFrom
          bash $scriptDir/gitclone.sh $creatoolstoolssource         $generationdir      $sourcesFrom
  #       bash $scriptDir/cvscheckout.sh $libidosource-ESRF         $generationdir   $cvsUserName
- #          mv $libidosource-ESRF $libidosource                 
+ #      mv $libidosource-ESRF $libidosource             
           
          cd $generationdir/creatools_source/$creasource
                 git checkout vtk7itk4wx3

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

diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh
index 7a7e683fde008c6b70772fa4580662ee5428a4f8..5dca330a39b87b6830e8a901ed1cf60d523746c5 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@ -65,11 +65,12 @@ fi
 touch     $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 chmod 755 $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 
+echo export GDK_BACKEND=x11                                                            >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 echo export MESA_GL_VERSION_OVERRIDE=3.2                               >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 echo installPrefixThird='$1'                                                                           >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 echo export PATH='$'PATH:'$'installPrefixThird/bin                     >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 echo export VTK_DIR='$'installPrefixThird/lib                          >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-echo export ITK_DIR='$'installPrefixThird/lib                          >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+echo export ITK_DIR='$'installPrefixThird/lib                                  >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 echo export GDCM_DIR='$'installPrefixThird/lib/gdcm            >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 echo export WT_DIR='$'installPrefixThird/lib/wt-3.3.4                  >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 echo export TTH='$'installPrefixThird/bin/tth                  >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
@@ -81,10 +82,10 @@ then
    echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'VTK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
    echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'WT_DIR        >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 else
-   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'GDCM_DIR   >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'ITK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'VTK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'WT_DIR            >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'GDCM_DIR          >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'ITK_DIR           >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'VTK_DIR           >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'WT_DIR                    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 fi
 
 cd $PWD/scripts