X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Fmove_thirdparty_libraries.bat;h=70a41427e8d1ad86eb4ed3c60155834e859a3046;hb=797e58f7171811248ae386e0d2df77e465750bb1;hp=b7d8073a197cbc4cd858421857d59dd06fc29ebb;hpb=4c2ec1cc232d7a53f78e933395ccd1ebbb4b27bc;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
index b7d8073..70a4142 100644
--- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
@@ -1,12 +1,23 @@
 @echo off
 echo -----------------------------------
+echo ------Asking Architecture----------
+echo -----------------------------------
+if %PROCESSOR_ARCHITECTURE%==x86 (
+  set ProgramFilesPath_x86=%ProgramFiles%
+  echo "Architecture found = x86"
+) else (
+  set "ProgramFilesPath_x64=%ProgramFiles%"
+  set "ProgramFilesPath_x86=%ProgramFiles(x86)%"
+  echo "Architecture found = x64"
+)
+echo -----------------------------------
 echo ---Setting Enviroment Variables----
 echo -----------------------------------
 
 set thirdpartyGeneration=%1
 set thirdpartyInstallPath=%2
 
-set "miktex=%ProgramFiles(x86)%\MiKTeX 2.9"
+set miktex="%ProgramFilesPath_x86%\MiKTeX 2.9\miktex\bin\texworks.exe"
 set installpath=%thirdpartyGeneration%\thirdparty_install
 set binpath=%thirdpartyGeneration%\thirdparty_bin
 set sourcepath=%thirdpartyGeneration%\thirdparty_source
@@ -34,13 +45,34 @@ set VTKINSTALLDIR=%installpath%\%vtk%
 set GDCMINSTALLDIR=%installpath%\%gdcm%
 set TTHDIR=%sourcepath%\%tth%
 
-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
 )
 
-goto next
+echo -----------------------------------
+echo Environment variables Configuration
+echo -----------------------------------
+echo ThirdpartyGeneration=%thirdpartyGeneration%
+echo MikTex=%miktex%
+echo InstallPath=%installpath%
+echo BinPath=%binpath%
+echo SourcePath=%sourcepath%
+echo creaThirdPartyLibraries=%thirdpartyInstallPath%\creaThirdParty_libraries
+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%
 
 mkdir %creaThirdPartyLibraries%
 
@@ -90,6 +122,9 @@ mkdir %creaThirdPartyLibraries%\%qt%\src\corelib
 mkdir %creaThirdPartyLibraries%\%qt%\src\gui
 
 XCOPY %QTDIR%\src\corelib\* %creaThirdPartyLibraries%\%qt%\src\corelib /s /i
+
+echo %QTDIR%\src\gui\
+echo %creaThirdPartyLibraries%\%qt%\src\gui
 XCOPY %QTDIR%\src\gui\* %creaThirdPartyLibraries%\%qt%\src\gui /s /i
 
 echo -----------------------------------
@@ -150,7 +185,7 @@ XCOPY %WXDIR%\src\zlib\* %creaThirdPartyLibraries%\%wxWidgets%\src\zlib /s /i
 echo -----------------------------------
 echo -------------Boost-----------------
 echo -----------------------------------
-cd %creaThirdPartyLibraries%\%boost%
+mkdir %creaThirdPartyLibraries%\%boost%
 
 mkdir %creaThirdPartyLibraries%\%boost%\include\%boost%\boost
 mkdir %creaThirdPartyLibraries%\%boost%\lib
@@ -306,6 +341,4 @@ echo -------------MiKText---------------
 echo -----------------------------------
 mkdir %creaThirdPartyLibraries%\%miktexAux%
 
-:next
-echo %miktex%
-XCOPY "%miktex%\*" %creaThirdPartyLibraries%\%miktexAux% /s /i
\ No newline at end of file
+XCOPY %miktex%\* %creaThirdPartyLibraries%\%miktexAux% /s /i