From: Diego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Date: Mon, 31 Oct 2011 00:25:11 +0000 (+0000)
Subject: DFCH
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=317143b7590f1af184f3a09c1ecd766c3eaa9209;p=creaToolsTools.git

DFCH
---

diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
index fe2d845..127d443 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
@@ -13,13 +13,14 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
 echo ----End Asking Architecture--------
 
 
-set thirdpartydlls_cmake=%1
-set thirdpartydllspath=%2
+set thirdpartydllspath=%1
+
+set thirdparty_cmake=%cd%\..\cmake
 
 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 sourcepath=%thirdparty_cmake%\crea_ThirdParty_dlls
+set binpath=%thirdparty_cmake%\crea_ThirdParty_dlls_Bin
 set installpath="C:\Temp\creatools\crea_ThirdParty_dlls"
 echo set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_dlls"
 
@@ -33,6 +34,7 @@ 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
diff --git a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
index 8ce0815..0145678 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
@@ -13,13 +13,14 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
 echo ----End Asking Architecture--------
 
 
-set thirdpartylib_cmake=%1
-set thirdpartylibpath=%2
+set thirdpartylibpath=%1
+
+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 sourcepath=%thirdparty_cmake%\crea_ThirdParty_Libraries
+set binpath=%thirdparty_cmake%\crea_ThirdParty_Libraries_Bin
 set installpath="C:\Temp\creatools\crea_ThirdParty_Libraries"
 echo set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_Libraries"
 
@@ -33,6 +34,7 @@ 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