#3133 creaToolsTools Feature New Normal - branch vtk7itk4wx3 wxWidgets3

[creaToolsTools.git] / Linux / scripts / ThirdParty-install-Finalize.sh

diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh
index 8ed620908a12d53970a1ca6a51fdc4b46d07f366..5dca330a39b87b6830e8a901ed1cf60d523746c5 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@ -44,8 +44,8 @@ echo "=================================== in ThirdParty-install-Finalize.sh ETC_
 # /// \TODO move theese ones upper in the process!  JPR
 
 export GDCM_DIR=$installPrefixThird/lib/gdcm/
-export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
-export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
+export VTK_DIR=$installPrefixThird/lib/cmake/vtk-7.1/
+export ITK_DIR=$installPrefixThird/lib
 export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
 
 baseLibraryThirdPartyDir=$installPrefixThird/share/creatools
@@ -65,12 +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/vtk-5.10         >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-echo export ITK_DIR='$'installPrefixThird/lib/InsightToolkit   >> $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 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
@@ -80,12 +80,12 @@ then
    echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'GDCM_DIR   >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
    echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'ITK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
    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
+   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