#3376 creaToolsTools Bug New Normal - vtk8itk5wx3-mingw64

[creaToolsTools.git] / Install_mingw64 / Install_ThirdParty / scripts / install_thirdparty_all.bat

diff --git a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat
index 5894d9cf4981d2c4d313edee0d5bb49bcaf167a3..bf1a395af2741b7310c8bd5bc67fe07e7600c7e4 100644 (file)
--- a/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_mingw64/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -183,7 +183,8 @@ echo %PATH%   >> %LogFolder%\boostInstall.log 2>&1
 cd %sourcepath%\%boost%\
 
 :: --with-system --with-signals
-b2 --build-dir=%binpath%\%boost%Bin\build --prefix=%installpath%\ toolset=gcc cxxflags="-std=c++98" variant=%buildType% link=shared runtime-link=shared -j %NUMBER_OF_PROCESSORS% install      >> %LogFolder%\boostInstall.log 2>&1 
+:: cxxflags="-std=c++98"
+b2 --build-dir=%binpath%\%boost%Bin\build --prefix=%installpath%\ toolset=gcc variant=%buildType% link=shared runtime-link=shared -j %NUMBER_OF_PROCESSORS% install      >> %LogFolder%\boostInstall.log 2>&1 
 
 
 :: cd %sourcepath%\%boost%
@@ -298,12 +299,13 @@ cd %itk%Bin
 ::     )
 ::)
 
-%cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin                                           >> %LogFolder%\ITKInstall.log 2>&1
-%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\ CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1
-%cmakeBin% -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt        >> %LogFolder%\ITKInstall.log 2>&1
-%cmakeBin% -D ITKV3_COMPATIBILITY:BOOL=ON -D Module_ITKReview::BOOL=ON CMakeCache.txt                              >> %LogFolder%\ITKInstall.log 2>&1
-mingw32-make.exe -j%NUMBER_OF_PROCESSORS%                                                                          >> %LogFolder%\ITKInstall.log 2>&1
-mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install                                                                  >> %LogFolder%\ITKInstall.log 2>&1
+%cmakeBin% -G"MinGW Makefiles" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin                                                                               >> %LogFolder%\ITKInstall.log 2>&1
+%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\ CMakeCache.txt   >> %LogFolder%\ITKInstall.log 2>&1
+%cmakeBin% -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt            >> %LogFolder%\ITKInstall.log 2>&1
+::%cmakeBin% -D ITKV3_COMPATIBILITY:BOOL=ON -D Module_ITKReview::BOOL=ON CMakeCache.txt                                >> %LogFolder%\ITKInstall.log 2>&1
+%cmakeBin%  -D Module_ITKReview::BOOL=ON CMakeCache.txt                                                                                                >> %LogFolder%\ITKInstall.log 2>&1
+mingw32-make.exe -j%NUMBER_OF_PROCESSORS%                                                                                                                                              >> %LogFolder%\ITKInstall.log 2>&1
+mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install                                                                                                                              >> %LogFolder%\ITKInstall.log 2>&1
        
 ::cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%itk%\ CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1
 ::cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1
@@ -333,19 +335,14 @@ cd %xercesc%Bin
 mingw32-make.exe -j%NUMBER_OF_PROCESSORS%                                                                              >> %LogFolder%\wercesInstall.log 2>&1
 mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install                                                                      >> %LogFolder%\wercesInstall.log 2>&1
 
-
 :SKIPINSTALLXERCES
 
 
 
-echo ----------------------------------------
-echo -------- SQLite Installation------------
-echo ----------------------------------------
-
 if %EEDinstallSQLite%==FALSE GOTO SKIPINSTALLSQLite
-echo -----------------------------------
-echo -------SQLite Installation------------
-echo -----------------------------------
+echo ---------------------------------------
+echo -------SQLite Installation-------------
+echo ---------------------------------------
 cd  %binpath%
 mkdir %SQLite%Bin
 cd %SQLite%Bin
@@ -375,9 +372,9 @@ mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install
 
 
 if %EEDinstallDLFCN%==FALSE GOTO SKIPINSTALLDLFCN
-echo -----------------------------------
-echo -------SKIPINSTALLDLFCN Installation------------
-echo -----------------------------------
+echo ------------------------------------------------
+echo -------DLFCN Installation-----------------------
+echo ------------------------------------------------
 cd  %binpath%
 mkdir %DLFCN%Bin
 cd %DLFCN%Bin
@@ -390,8 +387,17 @@ mingw32-make.exe -j%NUMBER_OF_PROCESSORS% install
 
 :SKIPINSTALLDLFCN
 
+
+
+echo -------------------------------------------------------
+echo -------PATCH  Moving dlls -----------------------------
+echo -------------------------------------------------------
+
 ::boost
 move /Y %installpath%\lib\*.dll %installpath%\bin
+:: PATCH ITK (after boost patch)
+:: EED2020-04-14       
+copy /Y %installpath%\bin\libitkminc2-5.0.dll  %installpath%\lib\libitkminc2-5.0.dll
 ::wxWidgets
 move /Y %installpath%\lib\gcc_dll\*.dll %installpath%\bin
 :: dlls mingw