X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39b6ed28636c4d67a0127d8526bf10dbc212cdc9..377ac7d3e14671c3feb8074eeb6db36f9667bac5:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 02e569be91..db45e7ee91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,11 +12,11 @@ set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE) # 3.5.99 -> alpha1 (oops) # 3.5.9{1,2} -> beta{1,2} # 3.5.9{3,4,5} -> rc{1,2,3} -# 3.6.{0,1} -> release 3.6, 3.6.1 +# 3.6.{0,1,2} -> release 3.6, 3.6.1, 3.6.2 set(SIMGRID_VERSION_MAJOR "3") set(SIMGRID_VERSION_MINOR "6") -set(SIMGRID_VERSION_PATCH "1") +set(SIMGRID_VERSION_PATCH "2") if(${SIMGRID_VERSION_PATCH} EQUAL "0") set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}") @@ -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)