X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Install_ThirdParty%2Fscripts%2Finstall_thirdparty_all.bat;h=bd8a5ee2c8c8b9033c668289a09501932542bce6;hb=797e58f7171811248ae386e0d2df77e465750bb1;hp=ca4fd01fdf1b7004c88b5de4810935a84fe34861;hpb=90d58dbfb6458016933a0e9f96150d5c93b3b661;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index ca4fd01..bd8a5ee 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
 )
@@ -53,11 +53,11 @@ set installpath=%thirdpartyGeneration%\thirdparty_install
 set binpath=%thirdpartyGeneration%\thirdparty_bin
 set sourcepath=%thirdpartyGeneration%\thirdparty_source
 
-set qt=Qt
-set wxWidgets=wxWidgets
-set boost=Boost
-set xercesc=xerces
-set itk=ITK
+set qt=Qt-4.7.3
+set wxWidgets=wxWidgets-2.9.2
+set boost=Boost-1.47.0
+set xercesc=xerces-c-3.1.1
+set itk=InsightToolkit-3.20.0
 set gdcm=gdcm
 set vtk=VTK
 
@@ -72,42 +72,40 @@ 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 -----------------------------------
 
 
 call %vcvarsall%
-
 echo -----------------------------------
 echo -------Creating Folders------------
 echo -----------------------------------
 
-
-
 rmdir %binpath% /s /q
 
 rmdir %thirdpartyGeneration% /s /q
@@ -229,7 +227,7 @@ del InsightToolkit-3.20.0.zip
 echo ----------Installing---------------
 
 cd  %binpath%
-mkdir %itk%Bin
+echo mkdir %itk%Bin
 cd %itk%Bin
 cmake -G"Visual Studio 10" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin 
 cmake -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%itk%\ -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
@@ -259,8 +257,6 @@ msbuild /p:Configuration=%buildType% INSTALL.vcxproj
 
 echo -----End XERCES Installation-------
 
-
-
 echo -----------------------------------
 echo -------VTK Installation------------
 echo -----------------------------------
@@ -275,6 +271,7 @@ del %thirdpartyGeneration%\thirdparty_source\VTK-5.8.0.tar
 
 echo ----------Installing---------------
 
+
 cd  %binpath%
 mkdir %vtk%Bin
 cd %vtk%Bin
@@ -285,7 +282,6 @@ cmake CMakeCache.txt
 FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
 msbuild /p:Configuration=%buildType% INSTALL.vcxproj
 cd c:\
-
 echo ------End VTK Installation---------
 
 echo -----------------------------------
@@ -320,10 +316,10 @@ echo -----------------------------------
 echo -------TTH Installation------------
 echo -----------------------------------
 echo ----------Extracting---------------
+cd %sourcepath%
 %zipPath% x tth_exe.zip
 rename tth_exe tth
 del tth_exe.zip
 echo ------End TTH Installation---------
-
 cd c:\
 @echo on
\ No newline at end of file