#3105 creaToolsTools Bug New Normal - creatools branch vtk7itk4 compilation with...

diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh
index cd6b11fb34309f268393a527c2d0cb14189aed2d..35479fcc7b23b613fd39fe48c723636f2d44ba9a 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@ -65,9 +65,10 @@ 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                  >> $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/InsightToolkit   >> $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
@@ -78,12 +79,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:'$'WT_DIR            >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 fi
 
 cd $PWD/scripts

diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index dc8ae79c900c12646df4736b3c109c0dbd5d1c56..1364d587586f4b5e035159af44253554aaacb54f 100644 (file)
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -216,7 +216,7 @@ then
     CMakeCache.txt
   fi
 
-  cmake -D VTK_Group_Views:BOOL=ON  -D VTK_Group_Qt:BOOL=ON  -D VTK_RENDERING_BACKEND:STRING=OpenGL  CMakeCache.txt
+  cmake -D VTK_Group_Views:BOOL=ON  -D VTK_Group_Qt:BOOL=ON   CMakeCache.txt
   cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON CMakeCache.txt
 ##??  cmake -D CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt