X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Finstall_generate_thirdparty.bat_TEMPLATE;h=792cebfc845dab936b665ee8675a5615fea5daf8;hb=6398de88b9d6895cd16c265722ddf5bfaacb6a60;hp=01faf825bec050f36074c6d3137317b5cac12671;hpb=706b0ca702c02384f0628497756f1cb9b1a4ed21;p=creaToolsTools.git

diff --git a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
index 01faf82..792cebf 100644
--- a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
+++ b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
@@ -1,50 +1,21 @@
-@echo off
-
-echo -----------------------------------
-echo ---Setting Environment Variables---
-echo -----------------------------------
-
-set thirdpartyGeneration=<directory where you want to generate>
-set buildType=<debug|release|RelWithDebInfo>
 
-echo thirdpartyGeneration=%thirdpartyGeneration%
-echo buildType=%buildType%
 
-echo -----------------------------------
-echo ---End Setting Global Variables----
-echo -----------------------------------
+@echo off
 
 echo -----------------------------------
-echo -------Calling Scripts-------------
+echo ---Setting Environment Variables---
 echo -----------------------------------
 
-cd scripts
-
-echo Calling install_thirdparty_all.bat
+set thirdpartyGeneration=<..directory where you want to generate..>
+set buildType=<debug|release>
 
-call install_thirdparty_all.bat  %thirdpartyGeneration% %buildType% >> install_generate_thirdparty.log 2>&1
+::Set the following line ON if you want to force x86 compilation
+set forcex86=<ON|OFF>
 
-echo Calling move_thirdparty_dlls.bat
+call scripts/tpl_variables.bat
 
-call move_thirdparty_dlls.bat %thirdpartyGeneration% >> install_generate_thirdparty.log 2>&1
-
-echo Calling move_thirdparty_libraries.bat
-
-call move_thirdparty_libraries.bat %thirdpartyGeneration% >> install_generate_thirdparty.log 2>&1
-
-echo Calling install_thirdparty_dlls_cmake.bat
-
-call install_thirdparty_dlls_cmake.bat  %thirdpartyGeneration% >> install_generate_thirdparty.log 2>&1
-
-echo Calling install_thirdparty_libraries_cmake.bat
-
-call install_thirdparty_libraries_cmake.bat  %thirdpartyGeneration% >> install_generate_thirdparty.log 2>&1
-
-cd ..
-
-echo -----------------------------------
-echo -------End of the Script-----------
-echo -----------------------------------
+call scripts/makeAll.bat
 
 pause
-exit
\ No newline at end of file
+
+exit