From 18f71428555e5ee870f03d86ced913c8a579737b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 5 Oct 2011 10:38:05 +0200 Subject: [PATCH] Rename the installer for windows with win32 or win64 --- CMakeLists.txt | 3 +++ buildtools/Cmake/simgrid.nsi.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a859a2c820..db45e7ee91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,9 +171,12 @@ if(WIN32) if(ARCH_32_BITS) ### Arch 32bits set(_WIN32 1) + set(NSIS_WIN_VERSION "win32") else(ARCH_32_BITS) ### Arch 64bits set(_WIN64 1) + set(NSIS_WIN_VERSION "win64") endif(ARCH_32_BITS) + set(_XBT_WIN32 1) diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in index 2c74f04c82..d627181d35 100644 --- a/buildtools/Cmake/simgrid.nsi.in +++ b/buildtools/Cmake/simgrid.nsi.in @@ -27,7 +27,7 @@ ;-------------------------------- Name "Simgrid" -outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_@SIMGRID_SYSTEM_PROCESSOR@@BIN_EXE@" +outFile "SimGrid@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@_@NSIS_WIN_VERSION@@BIN_EXE@" Icon "@CMAKE_HOME_DIRECTORY@\doc\webcruft\SimGrid.ico" # set the default installation directory -- 2.20.1