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=8197ade16bd2f1fc381c8e37d22c3d8642b67eeb;hpb=c6a324a9e343fcd992fc3e73e886bc0323d5c0a7;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
index 8197ade..04fb885 100644
--- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
@@ -1,26 +1,3 @@
-REM ---------------------------------------------------------------------
-REM
-REM Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-REM                        pour la Santé)
-REM Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
-REM
-REM  This software is governed by the CeCILL-B license under French law and 
-REM  abiding by the rules of distribution of free software. You can  use, 
-REM  modify and/ or redistribute the software under the terms of the CeCILL-B 
-REM  license as circulated by CEA, CNRS and INRIA at the following URL 
-REM  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-REM  or in the file LICENSE.txt.
-REM
-REM  As a counterpart to the access to the source code and  rights to copy,
-REM  modify and redistribute granted by the license, users are provided only
-REM  with a limited warranty  and the software's author,  the holder of the
-REM  economic rights,  and the successive licensors  have only  limited
-REM  liability. 
-REM
-REM  The fact that you are presently reading this means that you have had
-REM  knowledge of the CeCILL-B license and that you accept its terms.
-REM ------------------------------------------------------------------------  
-
 @echo off
 echo -----------------------------------
 echo --------Moving Libraries-----------
@@ -60,6 +37,7 @@ set itk=itk
 set gdcm=gdcm13
 set vtk=vtk
 set tth=tth
+set sqlite=sqlite
 
 
 set QTDIR=%sourcepath%\%qt%
@@ -74,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 (
@@ -121,6 +100,7 @@ echo BOOSTDIR=%BOOSTDIR%
 echo XERCESDIR=%XERCESDIR%
 echo ITKSRCDIR=%ITKSRCDIR%
 echo VTKSRCDIR=%VTKSRCDIR%
+echo SQLITESRCDIR=%SQLITESRCDIR%
 
 rmdir /S /Q %creaThirdPartyLibraries%
 
@@ -300,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%
 
@@ -460,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 -----------------------------------