DFCH: Thirdparty scripts beta1

diff --git a/Install_ThirdParty/scripts/creaThirdParty_dlls.bat b/Install_ThirdParty/scripts/creaThirdParty_dlls.bat
deleted file mode 100644 (file)
index fff5def..0000000
--- a/Install_ThirdParty/scripts/creaThirdParty_dlls.bat
+++ /dev/null
@@ -1,197 +0,0 @@
-@echo off
-echo -----------------------------------
-echo ---Setting Enviroment Variables----
-echo -----------------------------------
-
-@echo on
-set thirdpartyGeneration=%1
-
-set installpath=%thirdpartyGeneration%\thirdparty_install
-set binpath=%thirdpartyGeneration%\thirdparty_bin
-set sourcepath=%thirdpartyGeneration%\thirdparty_source
-set creaThirdPartydlls=%thirdpartyGeneration%\creaThirdParty
-
-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
-
-set QTDIR=%sourcepath%\%qt%
-set WXDIR=%sourcepath%\%wxWidgets%
-set BOOSTDIR=%sourcepath%\%boost%
-set XERCESDIR=%sourcepath%\%xercesc%
-set ITKSRCDIR=%sourcepath%\%itk%
-set VTKSRCDIR=%sourcepath%\%VTK%
-set GDCMSRCDIR=%sourcepath%\%gdcm%
-set ITKINSTALLDIR=%installpath%\%itk%
-set VTKINSTALLDIR=%installpath%\%vtk%
-set GDCMINSTALLDIR=%installpath%\%gdcm%
-
-mkdir %creaThirdPartydlls%
-
-@echo off
-echo -----------------------------------
-echo -------------QT--------------------
-echo -----------------------------------
-@echo on
-
-cd %creaThirdPartydlls%
-mkdir %qt%\lib
-copy /V /Y %QTDIR%\bin\phonon4.dll %qt%\lib
-copy /V /Y %QTDIR%\bin\QtCore4.dll %qt%\lib
-copy /V /Y %QTDIR%\bin\QtGui4.dll %qt%\lib
-copy /V /Y %QTDIR%\bin\QtNetwork4.dll %qt%\lib
-copy /V /Y %QTDIR%\bin\QtOpenGL4.dll %qt%\lib
-copy /V /Y %QTDIR%\bin\QtScript4.dll %qt%\lib
-copy /V /Y %QTDIR%\bin\QtScriptTools4.dll %qt%\lib
-copy /V /Y %QTDIR%\bin\QtSql4.dll %qt%\lib
-copy /V /Y %QTDIR%\bin\QtSvg4.dll %qt%\lib
-copy /V /Y %QTDIR%\bin\QtTest4.dll %qt%\lib
-copy /V /Y %QTDIR%\bin\QtXml4.dll %qt%\lib
-copy /V /Y %QTDIR%\bin\QtXmlPatterns4.dll %qt%\lib
-
-
-
-@echo off
-echo -----------------------------------
-echo -------------wxWidgets--------------------
-echo -----------------------------------
-@echo on
-cd %creaThirdPartydlls%
-mkdir %wxWidgets%\lib
-copy /V /Y %WXDIR%\lib\vc_dll\wxbase292u_net_vc_custom.dll %wxWidgets%\lib
-copy /V /Y %WXDIR%\lib\vc_dll\wxbase292u_vc_custom.dll %wxWidgets%\lib
-copy /V /Y %WXDIR%\lib\vc_dll\wxbase292u_xml_vc_custom.dll %wxWidgets%\lib
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_adv_vc_custom.dll %wxWidgets%\lib
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_aui_vc_custom.dll %wxWidgets%\lib
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_core_vc_custom.dll %wxWidgets%\lib
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_gl_vc_custom.dll %wxWidgets%\lib
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_html_vc_custom.dll %wxWidgets%\lib
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_media_vc_custom.dll %wxWidgets%\lib
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_qa_vc_custom.dll %wxWidgets%\lib
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_richtext_vc_custom.dll %wxWidgets%\lib
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_xrc_vc_custom.dll %wxWidgets%\lib
-
-@echo off
-echo -----------------------------------
-echo -------------Boost--------------------
-echo -----------------------------------
-@echo on
-
-cd %creaThirdPartydlls%
-mkdir %boost%\lib
-
-copy /V /Y %BOOSTDIR%\stage\lib\boost_date_time-vc100-mt-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_date_time-vc100-mt-gd-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_filesystem-vc100-mt-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_filesystem-vc100-mt-gd-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_graph-vc100-mt-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_graph-vc100-mt-gd-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_iostreams-vc100-mt-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_iostreams-vc100-mt-gd-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_prg_exec_monitor-vc100-mt-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_prg_exec_monitor-vc100-mt-gd-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_program_options-vc100-mt-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_program_options-vc100-mt-gd-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_regex-vc100-mt-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_regex-vc100-mt-gd-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_serialization-vc100-mt-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_serialization-vc100-mt-gd-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_signals-vc100-mt-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_signals-vc100-mt-gd-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_system-vc100-mt-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_system-vc100-mt-gd-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_thread-vc100-mt-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_thread-vc100-mt-gd-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_unit_test_framework-vc100-mt-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_unit_test_framework-vc100-mt-gd-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_wave-vc100-mt-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_wave-vc100-mt-gd-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_wserialization-vc100-mt-1_47.dll %boost%\lib
-copy /V /Y %BOOSTDIR%\stage\lib\boost_wserialization-vc100-mt-gd-1_47.dll %boost%\lib
-
-@echo off
-echo -----------------------------------
-echo -------------Xcerces--------------------
-echo -----------------------------------
-@echo on
-
-cd %creaThirdPartydlls%
-mkdir %xercesc%\lib
-
-copy /V /Y %XERCESDIR%\Build\Win32\VC10\Release\xerces-c_3_1.dll %xercesc%\lib
-
-@echo off
-echo -----------------------------------
-echo -------------ITK--------------------
-echo -----------------------------------
-@echo on
-
-cd %creaThirdPartydlls%
-mkdir %itk%\lib
-mkdir %itk%\bin
-
-copy /V /Y %ITKINSTALLDIR%\bin\ITKCommon.dll %itk%\lib
-
-copy /V /Y %ITKINSTALLDIR%\bin\itkTestDriver.exe %itk%\bin
-
-
-@echo off
-echo -----------------------------------
-echo -------------VTK--------------------
-echo -----------------------------------
-@echo on
-
-cd %creaThirdPartydlls%
-mkdir %vtk%\lib
-mkdir %vtk%\bin
-
-copy /V /Y %VTKINSTALLDIR%\bin\vtkEncodeString.exe %vtk%\bin
-
-
-copy /V /Y %VTKINSTALLDIR%\bin\QVTK.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkalglib.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkCommon.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkDICOMParser.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkexoIIc.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkexpat.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkFiltering.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkfreetype.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkftgl.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkGenericFiltering.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkGraphics.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkHybrid.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkImaging.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkInfovis.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkIO.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkjpeg.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtklibxml2.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkmetaio.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkNetCDF.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkpng.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkproj4.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkRendering.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtksys.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtktiff.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkverdict.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkViews.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkVolumeRendering.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkWidgets.dll %vtk%\lib
-copy /V /Y %VTKINSTALLDIR%\bin\vtkzlib.dll %vtk%\lib
-
-@echo off
-echo -----------------------------------
-echo -------------GDCM--------------------
-echo -----------------------------------
-@echo on
-
-cd %creaThirdPartydlls%
-mkdir %gdcm%\lib
-mkdir %gdcm%\bin
-
-
-copy /V /Y %GDCMINSTALLDIR%\bin\*.exe %gdcm%\bin
-copy /V /Y %GDCMINSTALLDIR%\bin\*.dll %gdcm%\lib
\ No newline at end of file

diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
new file mode 100644 (file)
index 0000000..fe2d845
--- /dev/null
+++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
@@ -0,0 +1,42 @@
+@echo off
+echo -----------------------------------
+echo ------Asking Architecture----------
+echo -----------------------------------
+if %PROCESSOR_ARCHITECTURE%==x86 (
+  set ProgramFilesPath_x86=%ProgramFiles%
+  echo "Architecture found = x86"
+) else (
+  set "ProgramFilesPath_x86=%ProgramFiles(x86)%"
+  echo "Architecture found = x64"
+)
+
+echo ----End Asking Architecture--------
+
+
+set thirdpartydlls_cmake=%1
+set thirdpartydllspath=%2
+
+set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
+
+set sourcepath=%thirdpartydlls_cmake%\crea_ThirdParty_dlls
+set binpath=%thirdpartydlls_cmake%\crea_ThirdParty_dlls_Bin
+set installpath="C:\Temp\creatools\crea_ThirdParty_dlls"
+echo set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_dlls"
+
+if not exist %vcvarsall% set zipPath="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
+if not exist %vcvarsall% (
+  echo ERROR!!! Visual Studio has not been found in the system
+  exit
+)
+
+call %vcvarsall%
+
+mkdir %binpath%
+cd %binpath%
+cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
+cmake -D CMAKE_INSTALL_PREFIX:PATH=%installpath% CMakeCache.txt
+cmake -D CREA_LIBRARY_DLL_PATH:PATH=%thirdpartydllspath% CMakeCache.txt
+cmake CMakeCache.txt
+FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
+msbuild /p:Configuration=release INSTALL.vcxproj
+@echo on
\ 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
new file mode 100644 (file)
index 0000000..8ce0815
--- /dev/null
+++ b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
@@ -0,0 +1,42 @@
+@echo off
+echo -----------------------------------
+echo ------Asking Architecture----------
+echo -----------------------------------
+if %PROCESSOR_ARCHITECTURE%==x86 (
+  set ProgramFilesPath_x86=%ProgramFiles%
+  echo "Architecture found = x86"
+) else (
+  set "ProgramFilesPath_x86=%ProgramFiles(x86)%"
+  echo "Architecture found = x64"
+)
+
+echo ----End Asking Architecture--------
+
+
+set thirdpartylib_cmake=%1
+set thirdpartylibpath=%2
+
+set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
+
+set sourcepath=%thirdpartylib_cmake%\crea_ThirdParty_Libraries
+set binpath=%thirdpartylib_cmake%\crea_ThirdParty_Libraries_Bin
+set installpath="C:\Temp\creatools\crea_ThirdParty_Libraries"
+echo set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_Libraries"
+
+if not exist %vcvarsall% set zipPath="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
+if not exist %vcvarsall% (
+  echo ERROR!!! Visual Studio has not been found in the system
+  exit
+)
+
+call %vcvarsall%
+
+mkdir %binpath%
+cd %binpath%
+cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
+cmake -D CMAKE_INSTALL_PREFIX:PATH=%installpath% CMakeCache.txt
+cmake -D CREA_LIBRARY_SOURCE_PATH:PATH=%thirdpartylibpath% CMakeCache.txt
+cmake CMakeCache.txt
+FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
+msbuild /p:Configuration=release INSTALL.vcxproj
+@echo on
\ 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 dc44462f2167741fbea6bbf27cfd9997f15982f1..c9506a92fd5e5d1e518d2c143ec23a12cbdef7b9 100644 (file)
--- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
@@ -31,130 +31,129 @@ set VTKINSTALLDIR=%installpath%\%vtk%
 set GDCMINSTALLDIR=%installpath%\%gdcm%
 
 mkdir %creaThirdPartydlls%
-mkdir %creaThirdPartydlls%\bin
 
 echo -----------------------------------
 echo -------------QT--------------------
 echo -----------------------------------
 
-copy /V /Y %QTDIR%\bin\phonon4.dll %creaThirdPartydlls%\bin
-copy /V /Y %QTDIR%\bin\QtCore4.dll %creaThirdPartydlls%\bin
-copy /V /Y %QTDIR%\bin\QtGui4.dll %creaThirdPartydlls%\bin
-copy /V /Y %QTDIR%\bin\QtNetwork4.dll %creaThirdPartydlls%\bin
-copy /V /Y %QTDIR%\bin\QtOpenGL4.dll %creaThirdPartydlls%\bin
-copy /V /Y %QTDIR%\bin\QtScript4.dll %creaThirdPartydlls%\bin
-copy /V /Y %QTDIR%\bin\QtScriptTools4.dll %creaThirdPartydlls%\bin
-copy /V /Y %QTDIR%\bin\QtSql4.dll %creaThirdPartydlls%\bin
-copy /V /Y %QTDIR%\bin\QtSvg4.dll %creaThirdPartydlls%\bin
-copy /V /Y %QTDIR%\bin\QtTest4.dll %creaThirdPartydlls%\bin
-copy /V /Y %QTDIR%\bin\QtXml4.dll %creaThirdPartydlls%\bin
-copy /V /Y %QTDIR%\bin\QtXmlPatterns4.dll %creaThirdPartydlls%\bin
+copy /V /Y %QTDIR%\bin\phonon4.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtCore4.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtGui4.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtNetwork4.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtOpenGL4.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtScript4.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtScriptTools4.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtSql4.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtSvg4.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtTest4.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtXml4.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtXmlPatterns4.dll %creaThirdPartydlls%
 
 echo -----------------------------------
 echo -------------wxWidgets-------------
 echo -----------------------------------
 
-copy /V /Y %WXDIR%\lib\vc_dll\wxbase292u_net_vc_custom.dll %creaThirdPartydlls%\bin
-copy /V /Y %WXDIR%\lib\vc_dll\wxbase292u_vc_custom.dll %creaThirdPartydlls%\bin
-copy /V /Y %WXDIR%\lib\vc_dll\wxbase292u_xml_vc_custom.dll %creaThirdPartydlls%\bin
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_adv_vc_custom.dll %creaThirdPartydlls%\bin
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_aui_vc_custom.dll %creaThirdPartydlls%\bin
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_core_vc_custom.dll %creaThirdPartydlls%\bin
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_gl_vc_custom.dll %creaThirdPartydlls%\bin
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_html_vc_custom.dll %creaThirdPartydlls%\bin
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_media_vc_custom.dll %creaThirdPartydlls%\bin
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_qa_vc_custom.dll %creaThirdPartydlls%\bin
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_richtext_vc_custom.dll %creaThirdPartydlls%\bin
-copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_xrc_vc_custom.dll %creaThirdPartydlls%\bin
+copy /V /Y %WXDIR%\lib\vc_dll\wxbase292u_net_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\vc_dll\wxbase292u_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\vc_dll\wxbase292u_xml_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_adv_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_aui_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_core_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_gl_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_html_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_media_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_qa_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_richtext_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_xrc_vc_custom.dll %creaThirdPartydlls%
 
 
 echo -----------------------------------
 echo -------------Boost-----------------
 echo -----------------------------------
 
-copy /V /Y %BOOSTDIR%\stage\lib\boost_date_time-vc100-mt-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_date_time-vc100-mt-gd-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_filesystem-vc100-mt-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_filesystem-vc100-mt-gd-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_graph-vc100-mt-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_graph-vc100-mt-gd-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_iostreams-vc100-mt-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_iostreams-vc100-mt-gd-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_prg_exec_monitor-vc100-mt-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_prg_exec_monitor-vc100-mt-gd-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_program_options-vc100-mt-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_program_options-vc100-mt-gd-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_regex-vc100-mt-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_regex-vc100-mt-gd-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_serialization-vc100-mt-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_serialization-vc100-mt-gd-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_signals-vc100-mt-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_signals-vc100-mt-gd-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_system-vc100-mt-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_system-vc100-mt-gd-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_thread-vc100-mt-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_thread-vc100-mt-gd-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_unit_test_framework-vc100-mt-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_unit_test_framework-vc100-mt-gd-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_wave-vc100-mt-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_wave-vc100-mt-gd-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_wserialization-vc100-mt-1_47.dll %creaThirdPartydlls%\bin
-copy /V /Y %BOOSTDIR%\stage\lib\boost_wserialization-vc100-mt-gd-1_47.dll %creaThirdPartydlls%\bin
+copy /V /Y %BOOSTDIR%\stage\lib\boost_date_time-vc100-mt-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_date_time-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_filesystem-vc100-mt-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_filesystem-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_graph-vc100-mt-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_graph-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_iostreams-vc100-mt-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_iostreams-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_prg_exec_monitor-vc100-mt-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_prg_exec_monitor-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_program_options-vc100-mt-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_program_options-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_regex-vc100-mt-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_regex-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_serialization-vc100-mt-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_serialization-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_signals-vc100-mt-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_signals-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_system-vc100-mt-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_system-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_thread-vc100-mt-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_thread-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_unit_test_framework-vc100-mt-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_unit_test_framework-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_wave-vc100-mt-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_wave-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_wserialization-vc100-mt-1_47.dll %creaThirdPartydlls%
+copy /V /Y %BOOSTDIR%\stage\lib\boost_wserialization-vc100-mt-gd-1_47.dll %creaThirdPartydlls%
 
 
 echo -----------------------------------
 echo -------------Xcerces---------------
 echo -----------------------------------
 
-copy /V /Y %XERCESDIR%\Build\Win32\VC10\Release\xerces-c_3_1.dll %creaThirdPartydlls%\bin
+copy /V /Y %XERCESDIR%\Build\Win32\VC10\Release\xerces-c_3_1.dll %creaThirdPartydlls%
 
 echo -----------------------------------
 echo -------------ITK-------------------
 echo -----------------------------------
 
-copy /V /Y %ITKINSTALLDIR%\bin\ITKCommon.dll %creaThirdPartydlls%\bin
-copy /V /Y %ITKINSTALLDIR%\bin\itkTestDriver.exe %creaThirdPartydlls%\bin
+copy /V /Y %ITKINSTALLDIR%\bin\ITKCommon.dll %creaThirdPartydlls%
+copy /V /Y %ITKINSTALLDIR%\bin\itkTestDriver.exe %creaThirdPartydlls%
 
 
 echo -----------------------------------
 echo -------------VTK-------------------
 echo -----------------------------------
 
-copy /V /Y %VTKINSTALLDIR%\bin\vtkEncodeString.exe %creaThirdPartydlls%\bin
-
-copy /V /Y %VTKINSTALLDIR%\bin\QVTK.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkalglib.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkCommon.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkDICOMParser.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkexoIIc.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkexpat.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkFiltering.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkfreetype.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkftgl.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkGenericFiltering.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkGraphics.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkHybrid.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkImaging.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkInfovis.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkIO.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkjpeg.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtklibxml2.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkmetaio.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkNetCDF.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkpng.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkproj4.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkRendering.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtksys.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtktiff.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkverdict.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkViews.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkVolumeRendering.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkWidgets.dll %creaThirdPartydlls%\bin
-copy /V /Y %VTKINSTALLDIR%\bin\vtkzlib.dll %creaThirdPartydlls%\bin
+copy /V /Y %VTKINSTALLDIR%\bin\vtkEncodeString.exe %creaThirdPartydlls%
+
+copy /V /Y %VTKINSTALLDIR%\bin\QVTK.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkalglib.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkCommon.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkDICOMParser.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkexoIIc.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkexpat.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkFiltering.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkfreetype.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkftgl.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkGenericFiltering.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkGraphics.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkHybrid.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkImaging.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkInfovis.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkIO.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkjpeg.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtklibxml2.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkmetaio.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkNetCDF.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkpng.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkproj4.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkRendering.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtksys.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtktiff.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkverdict.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkViews.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkVolumeRendering.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkWidgets.dll %creaThirdPartydlls%
+copy /V /Y %VTKINSTALLDIR%\bin\vtkzlib.dll %creaThirdPartydlls%
 
 echo -----------------------------------
 echo -------------GDCM------------------
 echo -----------------------------------
 
-copy /V /Y %GDCMINSTALLDIR%\bin\*.exe %creaThirdPartydlls%\bin
-copy /V /Y %GDCMINSTALLDIR%\bin\*.dll %creaThirdPartydlls%\bin
\ No newline at end of file
+copy /V /Y %GDCMINSTALLDIR%\bin\*.exe %creaThirdPartydlls%
+copy /V /Y %GDCMINSTALLDIR%\bin\*.dll %creaThirdPartydlls%
\ No newline at end of file

diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
index 1ae2502fe57b652bc7a84f0627e74096d2e6419e..70a41427e8d1ad86eb4ed3c60155834e859a3046 100644 (file)
--- 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,12 +45,35 @@ 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
 )
 
+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%
 
 echo -----------------------------------
@@ -88,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 -----------------------------------
@@ -148,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
@@ -304,4 +341,4 @@ echo -------------MiKText---------------
 echo -----------------------------------
 mkdir %creaThirdPartyLibraries%\%miktexAux%
 
-XCOPY "%miktex%\*" %creaThirdPartyLibraries%\%miktexAux% /s /i
\ No newline at end of file
+XCOPY %miktex%\* %creaThirdPartyLibraries%\%miktexAux% /s /i