DFCH: Feature #1524

creaThirdParty Libraries (Release version)

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt
index 86d6121c370863dbf0de446a744e8a12c166bf50..20d02cfbd07570e178115ae3328b06c6261369aa 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt
@@ -7,8 +7,8 @@ PROJECT(crea_ThirdParty_Libraries)
 #==================================
 # The project version
 SET(PROJECT_MAJOR_VERSION 3)
-SET(PROJECT_MINOR_VERSION 0)
-SET(PROJECT_BUILD_VERSION 1)
+SET(PROJECT_MINOR_VERSION 1)
+SET(PROJECT_BUILD_VERSION 0)
 #==================================
 
 #==================================

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt
index c84ce232cea16a13061c29c33fe07b2ad481721e..14fa7ec285da26109b57d51af9fd94ee9a76c5b7 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt
@@ -50,7 +50,7 @@ IF(WIN32 AND NOT UNIX)
 
 
   set  (CREA_BOOST_LYBRARY     boost)
-  set  (CREA_GDCM_LYBRARY      gdcm )
+  set  (CREA_GDCM_LYBRARY      gdcm13 )
   set  (CREA_ITK_LYBRARY       itk )
   set  (CREA_QT_LYBRARY                qt )
   set  (CREA_VTK_LYBRARY       vtk )  
@@ -104,6 +104,7 @@ IF (WIN32)
        
         #DFCH -- SET(MIKTEX_INSTALL_DIR "$INSTDIR\\\\bin\\\\MiKTeX-2.9\\\\miktex\\\\bin")
         #DFCH -- SET(CREATIS_THIRDPARTYLIBRARIES_DIRS ";${MIKTEX_INSTALL_DIR}")
+        SET(CREATIS_THIRDPARTYLIBRARIES_DIRS "") #DFCH
 
        SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS  "        
                WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '$INSTDIR\\\\bin\\\\tth' 

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt
index bd7c78154db69aa4a372d08305eea13e26c1b6fc..8e3f426e566997df70c7a64a0dc87099420c84dd 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt
@@ -3,8 +3,8 @@ PROJECT(crea_ThirdParty_dlls)
 cmake_minimum_required(VERSION 2.6)
 
 SET(PROJECT_MAJOR_VERSION 3)
-SET(PROJECT_MINOR_VERSION 0)
-SET(PROJECT_BUILD_VERSION 1)
+SET(PROJECT_MINOR_VERSION 1)
+SET(PROJECT_BUILD_VERSION 0)
 
 SET(CREA_VERBOSE_CMAKE TRUE)
 

diff --git a/Install_ThirdParty/scripts/cleanAll.bat b/Install_ThirdParty/scripts/cleanAll.bat
index f80598f05baca31f95fb68f1314d3b1062d06a91..d074d4a56072514a91715cd4b00db92494683039 100644 (file)
--- a/Install_ThirdParty/scripts/cleanAll.bat
+++ b/Install_ThirdParty/scripts/cleanAll.bat
@@ -11,7 +11,10 @@ echo -----------------------------------
 echo -------Removing Folders------------
 echo -----------------------------------
 
-rmdir /S /Q %thirdpartyGeneration%
+rmdir /S /Q %sourcepath%
+rmdir /S /Q %binpath%
+rmdir /S /Q %installpath%
+rmdir /S /Q %LogFolder%
 
 echo -----------------------------------
 echo -------Creating Folders------------

diff --git a/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_ThirdParty/scripts/download_ThirdPartySW.bat
index a5745d32dd1b77a3a0304ec23b42ca0ba9186772..b4a5842d94821a12452bc327d601b0570fea59a7 100644 (file)
--- a/Install_ThirdParty/scripts/download_ThirdPartySW.bat
+++ b/Install_ThirdParty/scripts/download_ThirdPartySW.bat
@@ -24,7 +24,6 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
 )
 
 set zipPath="%ProgramFilesPath_x86%\7-Zip\7z.exe"
-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="%ProgramFilesPath_x86%\GnuWin32\bin\wget.exe"
 
@@ -39,14 +38,6 @@ if not exist %vcvarsall% (
   exit
 )
 
-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
- )
-)
-
 if not exist %wgetPath% (
   echo ERROR!!! wget has not been found in the system
   exit
@@ -82,7 +73,6 @@ echo -----------------------------------
 echo ThirdpartyGeneration=%thirdpartyGeneration%
 echo BuildType=%buildType%
 echo wget=%wgetPath%
-echo MikTex=%miktex%
 echo urlCreatis=%urlCreatisSource%
 echo 7zip=%zipPath%
 echo Visual Studio=%vcvarsall%
@@ -195,7 +185,7 @@ rename wxWidgets-%WXVERSION% wxWidgets
 rename boost_1_49_0 boost
 rename InsightToolkit-3.20.1 itk
 rename VTK vtk
-rename gdcm gdcm
+rename gdcm gdcm13
 rename tth_exe tth
 rename xerces-c-3.1.1 xerces
 

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index 0f1631875c315bb8fa95e5752f63ed1a39efd96f..76d011bde38a74f6df35a298070b758958af86d8 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -38,7 +38,7 @@ set wxWidgets=wxWidgets
 set boost=boost
 set xercesc=xerces
 set itk=itk
-set gdcm=gdcm
+set gdcm=gdcm13
 set vtk=vtk
 
 set QTDIR=%sourcepath%\%qt%
@@ -195,7 +195,6 @@ msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel
 
 cd c:\
 
-
 echo -----------------------------------
 echo -------ITK Installation------------
 echo -----------------------------------

diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
index eec7edec13ca8aae9885e0736612f7029a9143aa..4dcafb0e586cb4089b8585d4d799d8346ebad50f 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
@@ -22,8 +22,6 @@ set buildType=%2
 set x86Comp=%3
 
 
-set version="3.0.1-win32"
-
 set thirdparty_cmake=%cd%\..\cmake
 
 set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
@@ -70,11 +68,4 @@ cmake CMakeCache.txt
 FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
 msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% PACKAGE.vcxproj
 
-set installerPath="%thirdpartydllspath%\thirdparty_bin\crea_ThirdParty_dlls_Bin\crea_ThirdParty_dlls-%version%.exe"
-
-if exist installerPath (
-mkdir %thirdpartyGeneration%\thirdparty_installers
-move /Y %installerPath% %thirdpartyGeneration%\thirdparty_installers
-)
-
 exit /B
\ No newline at end of file

diff --git a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
index 48da8b58bd616fe1c51f6ebe615dea54eeb75529..2c4946d45a0735fb4f95497e96e2a158d69a8d87 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
@@ -21,8 +21,6 @@ set buildType=%2
 ::The following line is to force x86 or x64 compilation
 set x86Comp=%3
 
-set version="3.0.1-win32"
-
 set thirdparty_cmake=%cd%\..\cmake
 
 set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
@@ -68,11 +66,4 @@ cmake CMakeCache.txt
 FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
 msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% PACKAGE.vcxproj
 
-set installerPath="%thirdpartydllspath%\thirdparty_bin\creaTPLBin\crea_ThirdParty_Libraries-%version%.exe"
-
-if exist installerPath (
-mkdir %thirdpartyGeneration%\thirdparty_installers
-move /Y %installerPath% %thirdpartyGeneration%\thirdparty_installers
-)
-
 exit /B
\ No newline at end of file

diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
index b41c358917af198b8a86d25e2b0e5ee2ec46659a..d538fcede2b2e0e6235d302e9e3171d3bfbc58df 100644 (file)
--- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
@@ -23,7 +23,7 @@ set wxWidgets=wxWidgets
 set boost=boost
 set xercesc=xerces
 set itk=itk
-set gdcm=gdcm
+set gdcm=gdcm13
 set vtk=vtk
 set tth=tth
 
@@ -50,11 +50,12 @@ echo if(%buildType%=="release")(
        set wxPrefixmsw=wxmsw28
        set boostMT=-vc100-mt-1_49.dll
        set boostMTGD=-vc100-mt-gd-1_49.dll
-echo ) else (
-echo   set qtBtype=d4
-echo   set wxPrefixBase=wxbase293d
-echo   set wxPrefixmsw=wxmsw293d
-echo )
+       ) 
+::else (
+::echo set qtBtype=d4
+::echo set wxPrefixBase=wxbase293d
+::echo set wxPrefixmsw=wxmsw293d
+::echo )
 
 
 if %x86Comp%==ON (
@@ -74,8 +75,6 @@ echo -----------------------------------
 echo Environment variables Configuration
 echo -----------------------------------
 echo ThirdpartyGeneration=%thirdpartyGeneration%
-echo MikTex=%miktex%
-echo miktexAux=%miktexAux%
 echo InstallPath=%installpath%
 echo BinPath=%binpath%
 echo SourcePath=%sourcepath%
@@ -112,33 +111,6 @@ copy /V /Y %QTDIR%\bin\QtTest%qtBtype%.dll %creaThirdPartydlls%
 copy /V /Y %QTDIR%\bin\QtXml%qtBtype%.dll %creaThirdPartydlls%
 copy /V /Y %QTDIR%\bin\QtXmlPatterns%qtBtype%.dll %creaThirdPartydlls%
 
-:: In order to compile I have to copy the following dlls -- change it because those libraries should be in dll folder of thirdparty libs
-copy /V /Y %QTDIR%\bin\assistant.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\designer.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\dumpcpp.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\idc.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\lconvert.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\linguist.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\lrelease.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\lupdate.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\moc.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\pixeltool.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\qcollectiongenerator.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\qhelpconverter.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\qhelpgenerator.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\qmake.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\qt3to4.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\qtdemo.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\rcc.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\uic.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\uic3.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\xmlpatterns.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\Qt3Support%qtBtype%.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtCore%qtBtype%.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtDesigner%qtBtype%.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtDesignerComponents%qtBtype%.dll %creaThirdPartydlls%
-::End of temporal copy
-
 echo -----------------------------------
 echo -------------wxWidgets-------------
 echo -----------------------------------

diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
index edfabdc9ebe44257189be20c6eb98b920eba4c2c..d0bbd5fb627e3510cf27875f0d23fd9bf065b7b6 100644 (file)
--- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
@@ -22,8 +22,6 @@ set thirdpartyInstallPath=%2
 ::The following line is to force x86 or x64 compilation
 set x86Comp=%3
 
-set MIKTEXPFDIR="%ProgramFilesPath_x86%\MiKTeX 2.9\miktex\bin\texworks.exe"
-
 set installpath=%thirdpartyGeneration%\thirdparty_install\%buildType%
 set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%
 set sourcepath=%thirdpartyGeneration%\thirdparty_source\%buildType%
@@ -36,10 +34,9 @@ set wxWidgets=wxWidgets
 set boost=boost
 set xercesc=xerces
 set itk=itk
-set gdcm=gdcm
+set gdcm=gdcm13
 set vtk=vtk
 set tth=tth
-set miktex=miktex
 
 
 set QTDIR=%sourcepath%\%qt%
@@ -54,30 +51,21 @@ set ITKINSTALLDIR=%installpath%\%itk%
 set VTKINSTALLDIR=%installpath%\%vtk%
 set GDCMINSTALLDIR=%installpath%\%gdcm%
 set TTHDIR=%sourcepath%\%tth%
-set MIKTEXDIR=%creaThirdPartyLibraries%\%miktex%
-
-if not exist %MIKTEXPFDIR% (
- set MIKTEXPFDIR="%ProgramFilesPath_x64%\MiKTeX 2.9\miktex\bin\texworks.exe"
- if not exist %MIKTEXPFDIR% (
-  echo ERROR!!! MiKTex has not been found in the system
-  exit
- ) else set MIKTEXPFDIR="%ProgramFilesPath_x64%\MiKTeX 2.9"
-) else set MIKTEXPFDIR="%ProgramFilesPath_x86%\MiKTeX 2.9"
-
 
 echo if(%buildType%==release)(
        set qtBtype=4
        set wxPrefixBase=wxbase28
        set wxPrefixmsw=wxmsw28
-       set boostMT=-vc100-mt-1_49.*
-       set boostMTGD=-vc100-mt-gd-1_49.*
-       set boostMTS=-vc100-mt-s-1_49.*
-       set boostMTSGD=-vc100-mt-sgd-1_49.*
-echo ) else (
-echo   set qtBtype=d4
-echo   set wxPrefixBase=wxbase293d
-echo   set wxPrefixmsw=wxmsw293d
-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
+ )
+:: else (
+::     set qtBtype=d4
+::     set wxPrefixBase=wxbase293d
+::     set wxPrefixmsw=wxmsw293d
+:: )
 
 if %x86Comp%==ON (
        set vcFolder=vc_dll
@@ -96,8 +84,6 @@ echo -----------------------------------
 echo Environment variables Configuration
 echo -----------------------------------
 echo ThirdpartyGeneration=%thirdpartyGeneration%
-echo MikTex=%miktex%
-echo miktexAux=%miktexAux%
 echo InstallPath=%installpath%
 echo BinPath=%binpath%
 echo SourcePath=%sourcepath%
@@ -134,7 +120,28 @@ mkdir %creaThirdPartyLibraries%\%qt%\mkspecs\
 mkdir %creaThirdPartyLibraries%\%qt%\src\
 
 XCOPY %QTDIR%\mkspecs\* %creaThirdPartyLibraries%\%qt%\mkspecs\ /s /i
-XCOPY %QTDIR%\include\* %creaThirdPartyLibraries%\%qt%\include\ /s /i
+
+XCOPY %QTDIR%\include\ActiveQt %creaThirdPartyLibraries%\%qt%\include\ActiveQt /s /i
+XCOPY %QTDIR%\include\phonon %creaThirdPartyLibraries%\%qt%\include\phonon /s /i
+XCOPY %QTDIR%\include\Qt %creaThirdPartyLibraries%\%qt%\include\Qt /s /i
+XCOPY %QTDIR%\include\Qt3Support %creaThirdPartyLibraries%\%qt%\include\Qt3Support /s /i
+XCOPY %QTDIR%\include\QtCore %creaThirdPartyLibraries%\%qt%\include\QtCore /s /i
+XCOPY %QTDIR%\include\QtDBus %creaThirdPartyLibraries%\%qt%\include\QtDBus /s /i
+XCOPY %QTDIR%\include\QtDeclarative %creaThirdPartyLibraries%\%qt%\include\QtDeclarative /s /i
+XCOPY %QTDIR%\include\QtDesigner %creaThirdPartyLibraries%\%qt%\include\QtDesigner /s /i
+XCOPY %QTDIR%\include\QtGui %creaThirdPartyLibraries%\%qt%\include\QtGui /s /i
+XCOPY %QTDIR%\include\QtHelp %creaThirdPartyLibraries%\%qt%\include\QtHelp /s /i
+XCOPY %QTDIR%\include\QtNetwork %creaThirdPartyLibraries%\%qt%\include\QtNetwork /s /i
+XCOPY %QTDIR%\include\QtOpenGL %creaThirdPartyLibraries%\%qt%\include\QtOpenGL /s /i
+XCOPY %QTDIR%\include\QtScript %creaThirdPartyLibraries%\%qt%\include\QtScript /s /i
+XCOPY %QTDIR%\include\QtScriptTools %creaThirdPartyLibraries%\%qt%\include\QtScriptTools /s /i
+XCOPY %QTDIR%\include\QtSql %creaThirdPartyLibraries%\%qt%\include\QtSql /s /i
+XCOPY %QTDIR%\include\QtSvg %creaThirdPartyLibraries%\%qt%\include\QtSvg /s /i
+XCOPY %QTDIR%\include\QtTest %creaThirdPartyLibraries%\%qt%\include\QtTest /s /i
+XCOPY %QTDIR%\include\QtUiTools %creaThirdPartyLibraries%\%qt%\include\QtUiTools /s /i
+XCOPY %QTDIR%\include\QtWebKit %creaThirdPartyLibraries%\%qt%\include\QtWebKit /s /i
+XCOPY %QTDIR%\include\QtXml %creaThirdPartyLibraries%\%qt%\include\QtXml /s /i
+XCOPY %QTDIR%\include\QtXmlPatterns %creaThirdPartyLibraries%\%qt%\include\QtXmlPatterns /s /i
 
 copy /V /Y %QTDIR%\bin\assistant.exe %creaThirdPartyLibraries%\%qt%\bin\
 copy /V /Y %QTDIR%\bin\designer.exe %creaThirdPartyLibraries%\%qt%\bin\
@@ -161,31 +168,42 @@ copy /V /Y %QTDIR%\bin\QtCore%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
 copy /V /Y %QTDIR%\bin\QtDesigner%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
 copy /V /Y %QTDIR%\bin\QtDesignerComponents%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
 
-:: In order to compile I have to copy the following dlls -- change it because those libraries should be in dll folder of thirdparty libs
-copy /V /Y %QTDIR%\bin\phonon%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
-copy /V /Y %QTDIR%\bin\QtCore%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
-copy /V /Y %QTDIR%\bin\QtGui%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
-copy /V /Y %QTDIR%\bin\QtNetwork%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
-copy /V /Y %QTDIR%\bin\QtOpenGL%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
-copy /V /Y %QTDIR%\bin\QtScript%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
-copy /V /Y %QTDIR%\bin\QtScriptTools%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
-copy /V /Y %QTDIR%\bin\QtSql%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
-copy /V /Y %QTDIR%\bin\QtSvg%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
-copy /V /Y %QTDIR%\bin\QtTest%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
-copy /V /Y %QTDIR%\bin\QtXml%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
-copy /V /Y %QTDIR%\bin\QtXmlPatterns%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
-::End of temporal copy
-
-XCOPY %QTDIR%\lib\*.lib %creaThirdPartyLibraries%\%qt%\lib\ /i
+::XCOPY %QTDIR%\lib\*.lib %creaThirdPartyLibraries%\%qt%\lib\ /i DFCH
+copy /V /Y %QTDIR%\lib\phonon4.lib %creaThirdPartyLibraries%\%qt%\lib\
+copy /V /Y %QTDIR%\lib\QAxContainer.lib %creaThirdPartyLibraries%\%qt%\lib\
+copy /V /Y %QTDIR%\lib\QAxServer.lib %creaThirdPartyLibraries%\%qt%\lib\
+copy /V /Y %QTDIR%\lib\Qt3Support4.lib %creaThirdPartyLibraries%\%qt%\lib\
+copy /V /Y %QTDIR%\lib\QtCore4.lib %creaThirdPartyLibraries%\%qt%\lib\
+copy /V /Y %QTDIR%\lib\QtGui4.lib %creaThirdPartyLibraries%\%qt%\lib\
+copy /V /Y %QTDIR%\lib\qtmain.lib %creaThirdPartyLibraries%\%qt%\lib\
+copy /V /Y %QTDIR%\lib\QtNetwork4.lib %creaThirdPartyLibraries%\%qt%\lib\
+copy /V /Y %QTDIR%\lib\QtOpenGL4.lib %creaThirdPartyLibraries%\%qt%\lib\
+copy /V /Y %QTDIR%\lib\QtScript4.lib %creaThirdPartyLibraries%\%qt%\lib\
+copy /V /Y %QTDIR%\lib\QtSql4.lib %creaThirdPartyLibraries%\%qt%\lib\
+copy /V /Y %QTDIR%\lib\QtSvg4.lib %creaThirdPartyLibraries%\%qt%\lib\
+copy /V /Y %QTDIR%\lib\QtTest4.lib %creaThirdPartyLibraries%\%qt%\lib\
+copy /V /Y %QTDIR%\lib\QtXml4.lib %creaThirdPartyLibraries%\%qt%\lib\
+copy /V /Y %QTDIR%\lib\QtXmlPatterns4.lib %creaThirdPartyLibraries%\%qt%\lib\
 
 mkdir %creaThirdPartyLibraries%\%qt%\src\corelib
 mkdir %creaThirdPartyLibraries%\%qt%\src\gui
 
 XCOPY %QTDIR%\src\corelib\* %creaThirdPartyLibraries%\%qt%\src\corelib /s /i
+rmdir %creaThirdPartyLibraries%\%qt%\src\corelib\animation /S /Q
+rmdir %creaThirdPartyLibraries%\%qt%\src\corelib\tmp /S /Q
+rmdir %creaThirdPartyLibraries%\%qt%\src\corelib\statemachine /S /Q
 
-echo %QTDIR%\src\gui\
-echo %creaThirdPartyLibraries%\%qt%\src\gui
 XCOPY %QTDIR%\src\gui\* %creaThirdPartyLibraries%\%qt%\src\gui /s /i
+::Cleaning directories
+rmdir %creaThirdPartyLibraries%\%qt%\src\gui\animation /S /Q
+rmdir %creaThirdPartyLibraries%\%qt%\src\gui\effects /S /Q
+rmdir %creaThirdPartyLibraries%\%qt%\src\gui\egl /S /Q
+rmdir %creaThirdPartyLibraries%\%qt%\src\gui\embedded /S /Q
+rmdir %creaThirdPartyLibraries%\%qt%\src\gui\math3d /S /Q
+rmdir %creaThirdPartyLibraries%\%qt%\src\gui\s60framework /S /Q
+rmdir %creaThirdPartyLibraries%\%qt%\src\gui\statemachine /S /Q
+rmdir %creaThirdPartyLibraries%\%qt%\src\gui\symbian /S /Q
+rmdir %creaThirdPartyLibraries%\%qt%\src\gui\tmp /S /Q
 
 echo -----------------------------------
 echo -------------wxWidgets-------------
@@ -208,21 +226,6 @@ copy /V /Y %WXDIR%\lib\vms_gtk.opt %creaThirdPartyLibraries%\%wxWidgets%\lib\
 
 mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
 
-:: In order to compile I have to copy the following dlls -- change it because those libraries should be in dll folder of thirdparty libs
-copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_net_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
-copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
-copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_xml_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
-copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_adv_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
-copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_aui_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
-copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_core_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
-copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_gl_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
-copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_html_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
-copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_media_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
-copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_qa_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
-copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_richtext_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
-copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_xrc_vc_custom.dll %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
-::End of temporal copy
-
 copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
 copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_net.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
 copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_xml.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
@@ -368,10 +371,6 @@ XCOPY %XERCESDIR%\src\* %creaThirdPartyLibraries%\%xercesc%\include\ /s /i
 
 copy /V /Y %XERCESDIR%\Build\%winType%\VC10\Release\xerces-c_3.lib %creaThirdPartyLibraries%\%xercesc%\lib\
 
-:: In order to compile I have to copy the following dlls -- change it because those libraries should be in dll folder of thirdparty libs
-copy /V /Y %XERCESDIR%\Build\%winType%\VC10\Release\xerces-c_3_1.dll %creaThirdPartyLibraries%\%xercesc%\lib\
-
-
 echo -----------------------------------
 echo -------------ITK-------------------
 echo -----------------------------------
@@ -391,11 +390,16 @@ mkdir %creaThirdPartyLibraries%\%vtk%
 
 mkdir %creaThirdPartyLibraries%\%vtk%\include
 mkdir %creaThirdPartyLibraries%\%vtk%\lib
-mkdir %creaThirdPartyLibraries%\%vtk%\bin
+::mkdir %creaThirdPartyLibraries%\%vtk%\bin
 
 XCOPY %VTKINSTALLDIR%\include\* %creaThirdPartyLibraries%\%vtk%\include /s /i
 XCOPY %VTKINSTALLDIR%\lib\* %creaThirdPartyLibraries%\%vtk%\lib /s /i
-XCOPY %VTKINSTALLDIR%\bin\* %creaThirdPartyLibraries%\%vtk%\bin /s /i
+::XCOPY %VTKINSTALLDIR%\bin\* %creaThirdPartyLibraries%\%vtk%\bin /s /i
+
+echo cleaning
+
+del %creaThirdPartyLibraries%\%vtk%\lib\vtk-5.10\VTKTargets.cmake
+del %creaThirdPartyLibraries%\%vtk%\lib\vtk-5.10\VTKTargets-release.cmake
 
 echo -----------------------------------
 echo -------------GDCM------------------
@@ -417,14 +421,6 @@ echo -----------------------------------
 mkdir %creaThirdPartyLibraries%\tth
 XCOPY %TTHDIR%\* %creaThirdPartyLibraries%\%tth% /s /i
 
-::echo -----------------------------------
-::echo -------------MiKText---------------
-::echo -----------------------------------
-::mkdir %creaThirdPartyLibraries%\%miktexAux%
-
-::XCOPY %MIKTEXPFDIR%\* %MIKTEXDIR% /s /i
-
-
 echo -----------------------------------
 echo -----End of Moving Libraries-------
 echo -----------------------------------