From: Eduardo DAVILA <davila@localhost.localdomain>
Date: Thu, 31 Aug 2017 18:48:04 +0000 (+0200)
Subject: #3118 creaToolsTools Feature New Normal  -  branch changestoITK3and4
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=65c548faded1c6849fe32bb4d079ca373ea98b7b;p=creaToolsTools.git

#3118 creaToolsTools Feature New Normal  -  branch changestoITK3and4
---

diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh
index 83e2569..a927f29 100644
--- a/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@ -45,7 +45,7 @@ echo "=================================== in ThirdParty-install-Finalize.sh ETC_
 
 export GDCM_DIR=$installPrefixThird/lib/gdcm/
 export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
-export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
+export ITK_DIR=$installPrefixThird/lib
 export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
 
 baseLibraryThirdPartyDir=$installPrefixThird/share/creatools
@@ -65,25 +65,25 @@ 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 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 TTH='$'installPrefixThird/bin/tth                	>> $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				>> $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 TTH='$'installPrefixThird/bin/tth               >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 
 if [ $OperatingSystem = "MacOS" ]
 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-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index 761a267..2b6eac5 100644
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -173,10 +173,10 @@ then
   ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   cmake -D CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
 
-  cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt
+  cmake -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt
   if [ $ITKVersion = ITK3 ]
   then
-    cmake -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
+    cmake -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
   fi
 
   if [ $ITKVersion = ITK4 ]