X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Fmove_thirdparty_libraries.bat;h=04fb885e007ef8a93adbadf42af609cd252d00b7;hb=f29a95efacb5238c370a0adeb5d39b7d95c7b0f8;hp=b650bb42c5e9e44b08eeccca834ee4ad456b5280;hpb=46fa7d8772214a9cf0a5ca8e208e400528e5e7c9;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
index b650bb4..04fb885 100644
--- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
@@ -37,6 +37,7 @@ set itk=itk
 set gdcm=gdcm13
 set vtk=vtk
 set tth=tth
+set sqlite=sqlite
 
 
 set QTDIR=%sourcepath%\%qt%
@@ -51,17 +52,18 @@ set ITKINSTALLDIR=%installpath%\%itk%
 set VTKINSTALLDIR=%installpath%\%vtk%
 set GDCMINSTALLDIR=%installpath%\%gdcm%
 set TTHDIR=%sourcepath%\%tth%
+set SQLITEINSTALLDIR=%installpath%\%sqlite%
 
-echo if(%buildType%==release)(
+if %buildType%==release (
 	set qtBtype=4
 	set wxPrefixBase=wxbase28
 	set wxPrefixmsw=wxmsw28
-	set xercesFile=xerces-c_3_1.dll
+	set xercesFile=xerces-c_3.lib
  ) else (
 	set qtBtype=d4
  	set wxPrefixBase=wxbase28d
 	set wxPrefixmsw=wxmsw28d
-	set xercesFile=xerces-c_3_1D.dll
+	set xercesFile=xerces-c_3D.lib
  )
 
 if %x86Comp%==ON (
@@ -98,6 +100,7 @@ echo BOOSTDIR=%BOOSTDIR%
 echo XERCESDIR=%XERCESDIR%
 echo ITKSRCDIR=%ITKSRCDIR%
 echo VTKSRCDIR=%VTKSRCDIR%
+echo SQLITESRCDIR=%SQLITESRCDIR%
 
 rmdir /S /Q %creaThirdPartyLibraries%
 
@@ -277,10 +280,15 @@ echo -----------------------------------
 echo -------------Boost-----------------
 echo -----------------------------------
 
-set boostMT=-vc100-mt-1_49.lib
-set boostMTGD=-vc100-mt-gd-1_49.lib
-set boostMTS=-vc100-mt-s-1_49.lib
-set boostMTSGD=-vc100-mt-sgd-1_49.lib
+REM set boostMT=-vc100-mt-1_49.lib
+REM set boostMTGD=-vc100-mt-gd-1_49.lib
+REM set boostMTS=-vc100-mt-s-1_49.lib
+REM set boostMTSGD=-vc100-mt-sgd-1_49.lib
+
+set boostMT=-vc100-mt-1_52.lib
+set boostMTGD=-vc100-mt-gd-1_52.lib
+set boostMTS=-vc100-mt-s-1_52.lib
+set boostMTSGD=-vc100-mt-sgd-1_52.lib
 
 mkdir %creaThirdPartyLibraries%\%boost%
 
@@ -437,6 +445,21 @@ echo -----------------------------------
 mkdir %creaThirdPartyLibraries%\tth
 XCOPY %TTHDIR%\* %creaThirdPartyLibraries%\%tth% /s /i
 
+
+echo -----------------------------------
+echo -------------SQLite------------------
+echo -----------------------------------
+mkdir %creaThirdPartyLibraries%\%sqlite%
+mkdir %creaThirdPartyLibraries%\%sqlite%\include
+mkdir %creaThirdPartyLibraries%\%sqlite%\lib
+
+echo XCOPY %SQLITEINSTALLDIR%\include\* %creaThirdPartyLibraries%\%sqlite%\include /s /i
+XCOPY %SQLITEINSTALLDIR%\include\* %creaThirdPartyLibraries%\%sqlite%\include /s /i
+XCOPY %SQLITEINSTALLDIR%\lib\* %creaThirdPartyLibraries%\%sqlite%\lib /s /i
+
+
+
+
 echo -----------------------------------
 echo -----End of Moving Libraries-------
 echo -----------------------------------