From 8754fd90208c6f2c894a1ef8a6f251021a70c50f Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 9 Aug 2017 14:36:59 +0200 Subject: [PATCH] #3105 creaToolsTools Bug New Normal - creatools branch vtk7itk4 compilation with vtk7 --- Linux/scripts/ThirdParty-install-Finalize.sh | 11 ++++++----- Linux/scripts/ThirdParty-install-VTK.sh | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh index cd6b11f..35479fc 100644 --- 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 dc8ae79..1364d58 100644 --- 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 -- 2.45.1