X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install-Finalize.sh;h=9adf1ab286f7c7e63930c0fcf93a1a56813254bf;hb=HEAD;hp=83e2569951ff26e6deef6fad56ef928399ad051c;hpb=86c5583aab988649d3987a15fcd17da4739baff3;p=creaToolsTools.git diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh index 83e2569..9adf1ab 100644 --- a/Linux/scripts/ThirdParty-install-Finalize.sh +++ b/Linux/scripts/ThirdParty-install-Finalize.sh @@ -44,9 +44,9 @@ 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 WT_DIR=$installPrefixThird/lib/wt-3.3.4/ +export VTK_DIR=$installPrefixThird/lib/cmake/vtk-8.1/ +export ITK_DIR=$installPrefixThird/lib +export WT_DIR=$installPrefixThird/lib/wt-4.0.4-rc1/ baseLibraryThirdPartyDir=$installPrefixThird/share/creatools @@ -65,12 +65,14 @@ fi touch $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh chmod 755 $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 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 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 WT_DIR='$'installPrefixThird/lib/wt-4.0.4-rc1 >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh echo export TTH='$'installPrefixThird/bin/tth >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh if [ $OperatingSystem = "MacOS" ] @@ -78,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