X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install%2Fscripts%2Fcmakemod.bat;h=c91daef5178fe16369b3d4c63719e16d9563e624;hb=bfd50d81b1a0115d5de2ceb5c083a47bee67005a;hp=d1f8f457eec7f7fd6c6fa682e661b19f9cabffa6;hpb=408ce0d93a1f7cf4e06d77e4dcc122e4a4965cc6;p=creaToolsTools.git

diff --git a/Install/scripts/cmakemod.bat b/Install/scripts/cmakemod.bat
index d1f8f45..c91daef 100644
--- a/Install/scripts/cmakemod.bat
+++ b/Install/scripts/cmakemod.bat
@@ -1,13 +1,31 @@
-REM %1=<Module Sources  Ex. crea bbbtk creaMaracasVisu...>
-REM %2=<dirInstall>
-
-set currentdir=%~dp0
-set currentdir=%currentdir:\=/%
-set dirInstallModule=%2\%1
-
-mkdir %1Bin
-cd %1Bin
-cmake -G"Visual Studio 9 2008" -H%currentdir%%1 -B%currentdir%%1Bin
-cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=%dirInstallModule% CMakeCache.txt
-cd ..
+REM %1 = <Module Sources  Ex. crea bbbtk creaMaracasVisu...>
+REM %2 = <installPrefix>
+REM %3 = <creatoolsGeneration>
+
+if %PROCESSOR_ARCHITECTURE%==x86 (
+  set ProgramFilesPath_x86=%ProgramFiles%
+  echo "Architecture found = x86"
+) else (
+  set "ProgramFilesPath_x86=%ProgramFiles(x86)%"
+  echo "Architecture found = x64"
+)
+
+set compilerVersion="Visual Studio 10"
+set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
+if not exist %vcvarsall% set vcvarsall="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
+if not exist %vcvarsall% (
+  set compilerVersion="Visual Studio 9 2008"
+  set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
+  if not exist %vcvarsall% set vcvarsall="%ProgramFilesPath_x64%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
+  if not exist %vcvarsall% (
+    echo ERROR!!! Visual Studio has not been found in the system
+    exit
+  )
+)
+
+set binfolder=%3\creatools_bin\%1Bin
+cd %binfolder%
+
+cmake -G%compilerVersion% -H%3\creatools_sources\%1 -B%3\creatools_bin\%1Bin
+cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=%2\%1 CMakeCache.txt