]> Creatis software - creaToolsTools.git/commitdiff
#3450 vtk9itk5wx3-macos
authorEduardo DAVILA <davila@creatis.insa-lyon.fr>
Thu, 21 Jul 2022 10:35:34 +0000 (12:35 +0200)
committerEduardo DAVILA <davila@creatis.insa-lyon.fr>
Thu, 21 Jul 2022 10:35:34 +0000 (12:35 +0200)
Linux/scripts/ThirdParty-install-VTK.sh
Linux/scripts/ThirdParty-install-gdcm.sh

index f15de634604fabd8102c445af805dbb98c7e0746..391392571296128fa3a2024cd89fffe09ce91bc6 100644 (file)
@@ -158,9 +158,10 @@ cxxFlags='  '
 if [ $TDx == "ON" ]
 then
     cxxFlags=$cxxFlags'-F/Library/Frameworks -DVTK_USE_TDX '
-    libname=VTK-8.2.0-Patch-TDx
+#    libname=VTK-8.2.0-Patch-TDx
 else
-    libname=VTK-8.2.0-Patch
+#    libname=VTK-8.2.0-Patch
+     libname=VTK-9.2.0.rc1
 fi
 
 wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/$libname.zip
@@ -222,7 +223,8 @@ unzip $libname.zip
 #if [ true = false ]
 if [ true = true ]
 then
-  libnameB=vtk-8.2
+##  libnameB=vtk-8.2
+  libnameB=vtk-9.2
   dirInstall=$binDir/$libname-Bin
 ##  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
   export VTK_DIR=$installPrefixThird/lib/cmake/$libnameB/
@@ -246,14 +248,14 @@ then
 
   if [ $OperatingSystem = "MacOS" ]
   then
-    cmake -D BUILD_SHARE_LIBS:BOOL=ON -D VTK_USE_CARBON:BOOL=OFF -D  VTK_USE_COCOA:BOOL=ON CMakeCache.txt
-    cmake -D  VTK_USE_TCL:BOOL=OFF                                                         CMakeCache.txt
+#    cmake -D BUILD_SHARE_LIBS:BOOL=ON -D VTK_USE_CARBON:BOOL=OFF -D  VTK_USE_COCOA:BOOL=ON CMakeCache.txt
+#    cmake -D  VTK_USE_TCL:BOOL=OFF                                                         CMakeCache.txt
     CMakeCache.txt
    echo
   fi
 
-  cmake -D VTK_Group_Views:BOOL=ON -D VTK_Group_Qt:BOOL=OFF   CMakeCache.txt
-  cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON CMakeCache.txt
# cmake -D VTK_Group_Views:BOOL=ON -D VTK_Group_Qt:BOOL=OFF   CMakeCache.txt
# cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON CMakeCache.txt
   cmake -D CMAKE_INSTALL_LIBDIR:STRING="lib" CMakeCache.txt
 
   make -j $corenumber
index 2f511c824d4ce4b9e81fab61f96343a6c65458bb..c374ae6bed92e8727583dd7385ae022a57fc2ac6 100644 (file)
@@ -132,8 +132,11 @@ then
 fi
 
 
-    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm13_2019_06_17_vtk8.zip
-       unzip gdcm13_2019_06_17_vtk8.zip
+#    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm13_2019_06_17_vtk8.zip
+#      unzip gdcm13_2019_06_17_vtk8.zip
+
+    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm13_2022_07_21_vtk92.zip
+       unzip gdcm13_2022_07_21_vtk92.zip       
 
 if [ $buildType = "Debug" ]
 then