X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Finstall_thirdparty_libraries_cmake.bat;h=2f5f5b45ef590814bb44e5a5ad5cea1aeee925c1;hb=11c30fbd126b4a4c79ad39bb9ab2d5c22f6badbc;hp=8ce08153f8803ca4e2779e7cb1c94739e5d2f766;hpb=797e58f7171811248ae386e0d2df77e465750bb1;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
index 8ce0815..2f5f5b4 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
@@ -1,5 +1,9 @@
 @echo off
 echo -----------------------------------
+echo -----Generating Installers of------
+echo -----creaThirdPartyLibraries-------
+echo -----------------------------------
+echo -----------------------------------
 echo ------Asking Architecture----------
 echo -----------------------------------
 if %PROCESSOR_ARCHITECTURE%==x86 (
@@ -12,16 +16,18 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
 
 echo ----End Asking Architecture--------
 
+set thirdpartyGeneration=%1
+set buildType=%2
+::The following line is to force x86 or x64 compilation
+set x86Comp=%3
 
-set thirdpartylib_cmake=%1
-set thirdpartylibpath=%2
+set thirdparty_cmake=%cd%\..\cmake
 
 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"
+set thirdpartylibpath=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_libraries
+set sourcepath=%thirdparty_cmake%\crea_ThirdParty_Libraries
+set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%\creaTPLBin
 
 if not exist %vcvarsall% set zipPath="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
 if not exist %vcvarsall% (
@@ -29,14 +35,41 @@ if not exist %vcvarsall% (
   exit
 )
 
-call %vcvarsall%
+if %x86Comp%==ON (
+	call %vcvarsall%
+	echo "Compilation forced x86"
+) else (
+	if %PROCESSOR_ARCHITECTURE%==x86 (
+		set installpath="%ProgramFilesPath_x86%\creatools\crea_ThirdParty_Libraries"
+		call %vcvarsall%
+	) else (
+		set installpath="%ProgramFiles%\creatools\crea_ThirdParty_Libraries"
+		call %vcvarsall% amd64
+	)
+)
 
+rmdir /S /Q %binpath%
 mkdir %binpath%
 cd %binpath%
-cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
+
+if %x86Comp%==ON (
+	set buildPlatform=win32
+	cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
+) else (
+	if %PROCESSOR_ARCHITECTURE%==x86 (
+   	    set buildPlatform=win32
+		cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
+	) else (
+  	    set buildPlatform=win64
+		cmake -G"Visual Studio 10 Win64"  -H%sourcepath% -B%binpath%
+	)
+)
+
+cmake -D CREATOOLS_BUILDTYPE:STRING=%buildType% -D CREATOOLS_PLATFORM:STRING=%buildPlatform%  CMakeCache.txt
 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
+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
+
+exit /B
\ No newline at end of file