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=7e6a048f190ca9cf56d50e9ff3cf16fbfee5dabe;hpb=c6a324a9e343fcd992fc3e73e886bc0323d5c0a7;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
index 7e6a048..2f5f5b4 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
@@ -1,26 +1,3 @@
-REM ---------------------------------------------------------------------
-REM
-REM Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-REM                        pour la Santé)
-REM Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
-REM
-REM  This software is governed by the CeCILL-B license under French law and 
-REM  abiding by the rules of distribution of free software. You can  use, 
-REM  modify and/ or redistribute the software under the terms of the CeCILL-B 
-REM  license as circulated by CEA, CNRS and INRIA at the following URL 
-REM  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-REM  or in the file LICENSE.txt.
-REM
-REM  As a counterpart to the access to the source code and  rights to copy,
-REM  modify and redistribute granted by the license, users are provided only
-REM  with a limited warranty  and the software's author,  the holder of the
-REM  economic rights,  and the successive licensors  have only  limited
-REM  liability. 
-REM
-REM  The fact that you are presently reading this means that you have had
-REM  knowledge of the CeCILL-B license and that you accept its terms.
-REM ------------------------------------------------------------------------  
-
 @echo off
 echo -----------------------------------
 echo -----Generating Installers of------
@@ -76,15 +53,19 @@ mkdir %binpath%
 cd %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