From: Diego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Date: Sun, 30 Oct 2011 21:26:03 +0000 (+0000)
Subject: DFCH: Last update for windows x64
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaToolsTools.git;a=commitdiff_plain;h=a766b8bd4704838ffbf6f31d4861e4f807947aeb

DFCH: Last update for windows x64
---

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index 1d94281..a0d1bdd 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -24,7 +24,7 @@ set urlCreatisSource=http://www.creatis.insa-lyon.fr/software/public/creatools/c
 set urlCreatisSource=http://www.creatis.insa-lyon.fr/~caceres/software
 
 set zipPath="%ProgramFilesPath_x86%\7-Zip\7z.exe"
-set "miktex=%ProgramFiles(x86)%\MiKTeX 2.9"
+set miktex="%ProgramFilesPath_x86%\MiKTeX 2.9\miktex\bin\texworks.exe"
 set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
 set wgetPath=%cd%\..\..\windows\creaTools_win_installers\CreaTools_v2_0_0_win32_installer\bin\wget.exe
 
@@ -38,8 +38,8 @@ if not exist %vcvarsall% (
   echo ERROR!!! Visual Studio has not been found in the system
   exit
 )
-if "%miktex%"=="\MiKTeX 2.9" set "miktex=%ProgramFiles%\MiKTeX 2.9"
-if "%miktex%"=="\MiKTeX 2.9" (
+if not exist %miktex% set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9\miktex\bin\texworks.exe"
+if not exist %miktex% (
   echo ERROR!!! MiKTex has not been found in the system
   exit
 )
@@ -72,29 +72,30 @@ set GDCMSRCDIR=%sourcepath%\%gdcm%
 echo -----------------------------------
 echo Environment variables Configuration
 echo -----------------------------------
-echo %thirdpartyGeneration%
-echo %buildType%
-echo %wgetPath%
-echo %urlCreatisSource%
-echo %zipPath%
-echo %vcvarsall%
-echo %installpath%
-echo %binpath%
-echo %sourcepath%
-echo %qt%
-echo %wxWidgets%
-echo %boost%
-echo %xercesc%
-echo %itk%
-echo %gdcm%
-echo %vtk%
-echo %QTDIR%
-echo %WXDIR%
-echo %BOOSTDIR%
-echo %XERCESDIR%
-echo %ITKSRCDIR%
-echo %VTKSRCDIR%
-echo %GDCMSRCDIR%
+echo ThirdpartyGeneration=%thirdpartyGeneration%
+echo BuildType=%buildType%
+echo wget=%wgetPath%
+echo MikTex=%miktex%
+echo urlCreatis=%urlCreatisSource%
+echo 7zip=%zipPath%
+echo Visual Studio=%vcvarsall%
+echo InstallPath=%installpath%
+echo BinPath=%binpath%
+echo SourcePath%sourcepath%
+echo QT=%qt%
+echo WX=%wxWidgets%
+echo BOOST=%boost%
+echo Xercesc=%xercesc%
+echo ITK=%itk%
+echo GDCM=%gdcm%
+echo VTK=%vtk%
+echo QTDIR=%QTDIR%
+echo WKDIR=%WXDIR%
+echo BOOSTDIR=%BOOSTDIR%
+echo XERCESDIR=%XERCESDIR%
+echo ITKSRCDIR=%ITKSRCDIR%
+echo VTKSRCDIR=%VTKSRCDIR%
+echo GDCMDIR=%GDCMSRCDIR%
 
 echo ---End Setting Global Variables----
 echo -----------------------------------
@@ -105,8 +106,6 @@ echo -----------------------------------
 echo -------Creating Folders------------
 echo -----------------------------------
 
-
-
 rmdir %binpath% /s /q
 
 rmdir %thirdpartyGeneration% /s /q