From a98078e6695b700de44ccba2b3ef786795f3d4fa Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 25 Aug 2021 14:44:56 +0200 Subject: [PATCH] #3405 vtk8itk5wx3-macos --- Linux/installscript | 14 +++++++++++++- Linux/scripts/ThirdParty-install-VTK.sh | 8 ++++---- Linux/scripts/ThirdParty-install-gdcm.sh | 1 + 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Linux/installscript b/Linux/installscript index b7c2f49..65a5ae4 100755 --- a/Linux/installscript +++ b/Linux/installscript @@ -23,7 +23,17 @@ #!/bin/bash -e -scriptDirName=$(dirname $(readlink -f $0) ) + +#This code is Mac +function EEDreadlink() { + DIR="${1%/*}" + (cd "$DIR" && echo "$(pwd -P)") +} + + +#EED 2120-08-25 This code is not working in MacOS so we use EEDreadlink() +#EED scriptDirName=$(dirname $(Ereadlink -f $0) ) +scriptDirName=$(dirname $(Ereadlink $0) )/Linux ######################################################################### ############ Local Functions ####################################### @@ -257,6 +267,8 @@ fi if [ `checkVal $command all 3rd 3rd-gdcm` == true ] ; then bigDisplay "INSTALL $gdcmVersion" source scripts/ThirdParty-install-gdcm.sh + pwd + echo $scriptDirName cd $scriptDirName fi diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh index 5bbc220..b477600 100644 --- a/Linux/scripts/ThirdParty-install-VTK.sh +++ b/Linux/scripts/ThirdParty-install-VTK.sh @@ -151,10 +151,8 @@ fi ## ## fi - wget https://www.vtk.org/files/release/8.2/VTK-8.2.0.zip - unzip VTK-8.2.0.zip - - + wget https://www.vtk.org/files/release/8.2/VTK-8.2.0.zip + unzip VTK-8.2.0.zip #if [ $buildType = "Debug" ] #then @@ -220,6 +218,7 @@ then if [ $OperatingSystem = "MacOS" ] then cmake -D CMAKE_CXX_COMPILER:FILE=/usr/bin/g++ + echo fi cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/ @@ -231,6 +230,7 @@ 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 CMakeCache.txt + echo fi cmake -D VTK_Group_Views:BOOL=ON -D VTK_Group_Qt:BOOL=ON CMakeCache.txt diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh index d067f6b..52ea4b6 100644 --- a/Linux/scripts/ThirdParty-install-gdcm.sh +++ b/Linux/scripts/ThirdParty-install-gdcm.sh @@ -125,6 +125,7 @@ fi wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm13_2018_05_28_vtk8.zip unzip gdcm13_2018_05_28_vtk8.zip + # mv gdcm13_2018_05_28_vtk8 gdcm if [ $buildType = "Debug" ] -- 2.47.1