X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FCreaTools-compile.sh;h=7797dce4d2902446c791d4942b42df4c5d028352;hb=872e19d0d022a1723ad6ec435be1899105f4f6f6;hp=931203711d9d4863d5ab48dddce85c12585dcf5f;hpb=c6a324a9e343fcd992fc3e73e886bc0323d5c0a7;p=creaToolsTools.git

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index 9312037..7797dce 100644
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -69,9 +69,9 @@ fi
    echo $start_point
    echo "------"
 
-if [ ! -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
+if [ ! -f $installPrefixThird/share/creatools/creatools_third_party_library_config.sh ]
 then
- echo missing  $installPrefixThird/share/creatools_third_party_library_config.sh
+ echo missing  $installPrefixThird/share/creatools/creatools_third_party_library_config.sh
    echo
    echo "..ERROR.."
    echo "==================================================="
@@ -101,9 +101,9 @@ fi
 fi
 
 
-if [ ! -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
+if [ ! -f $installPrefixThird/share/creatools/creatools_third_party_library_config.sh ]
 then
- echo missing  $installPrefixThird/share/creatools_third_party_library_config.sh
+ echo missing  $installPrefixThird/share/creatools/creatools_third_party_library_config.sh
    echo
    echo "..ERROR.."
    echo "==================================================="
@@ -121,7 +121,7 @@ fi
  then
     rm -rf creatools_bin
  fi
- mkdir creatools_bin
+ mkdir -p creatools_bin
 
 cd $scriptDir
 
@@ -165,6 +165,7 @@ then
      bash $scriptDir/cmakemod.sh               $bbtksource $generationdir $installPrefix $buildType
      bash $scriptDir/bbtkVariables.sh          $bbtksource $generationdir $docgeneration $gdcmVersion
      bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber
+     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber
      bash $scriptDir/ctestmod.sh               $bbtksource $generationdir
    fi
 fi
@@ -415,5 +416,36 @@ then
 fi
 
 
+# -------------------------
+#        start_point =  14 : creaVtk
+#-------------------------
+if [ $start_point -le 14 ]
+then
+   # the following stupid test is used at debug time; Please don't remove!
+   #if [ true = false ]
+   if [ true = true ]
+   then
+      # creaVtk
+      bash $scriptDir/cmakemod.sh              $creavtksource $generationdir $installPrefix $buildType 
+      bash $scriptDir/creaVtkVariables.sh  $creavtksource $generationdir $docgeneration
+      bash $scriptDir/compilemod.sh $buildType $creavtksource $generationdir $corenumber
+      bash $scriptDir/ctestmod.sh              $creavtksource $generationdir
+   fi
+fi
+ creavtkdll=$generationdir/creatools_bin/creaVtkBin
+
+if [ $OperatingSystem = "MacOS" ]
+then
+    #duplicate form creaTools_name.sh?? //FCY
+    DYLD_LIBRARY_PATH=$creavtkdll:$DYLD_LIBRARY_$PATH
+else
+    LD_LIBRARY_PATH=$creavtkdll:$LD_LIBRARY_$PATH
+fi 
+ 
+ export creaVtk_DIR=$generationdir/creatools_bin/creaVtkBin
+
+
+
+
 # shutdown /s
 # exit /b