X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d7e7eee763c2f0b71df75a4da2306a6bb01f2b0..b5e4e55f2834d9aeb5b9429487af5cca7fba9740:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index b4f48f4f75..bb2860230d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,13 +12,17 @@ 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 -> release 3.6 +# 3.6.{0,1} -> release 3.6, 3.6.1 set(SIMGRID_VERSION_MAJOR "3") set(SIMGRID_VERSION_MINOR "6") -set(SIMGRID_VERSION_PATCH "0") +set(SIMGRID_VERSION_PATCH "1") -set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}") +if(${SIMGRID_VERSION_PATCH} EQUAL "0") + set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}") +else(${SIMGRID_VERSION_PATCH} EQUAL "0") + set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}.${SIMGRID_VERSION_PATCH}") +endif(${SIMGRID_VERSION_PATCH} EQUAL "0") set(libsimgrid_version "${release_version}") set(libgras_version "${release_version}") set(libsmpi_version "${release_version}") @@ -31,6 +35,7 @@ if(APPLE) #MAC else(APPLE) if(WIN32) #WINDOWS set(LIB_EXE "a") + set(BIN_EXE ".exe") else(WIN32) #UNIX set(LIB_EXE "so") endif(WIN32)