X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c2b78ec073f36bff1c8545f8a28439b222adfc2c..77dc8c37f29bb55bcbbbda3da52f06d1fe438510:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 80bc299ab5..d783249ebe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,9 +4,6 @@ if(WIN32) SET(CMAKE_RC_COMPILER "windres") endif() project(SimGrid C) -if (enable_gtnets OR enable_ns3 OR enable_model-checking) - enable_language(CXX) -endif() enable_language(CXX) @@ -42,12 +39,6 @@ if (NOT DEFINED enable_smpi OR enable_smpi) # smpi is enabled by default enable_language(Fortran OPTIONAL) endif() -set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE) -set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE) -set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE) -set(CMAKE_C_LINK_FLAGS "" CACHE TYPE INTERNAL FORCE) -set(CMAKE_Fortran_FLAGS "" CACHE TYPE INTERNAL FORCE) -set(CMAKE_Fortran_LINK_FLAGS "" CACHE TYPE INTERNAL FORCE) ## Mapping version number -> version name # 3.5.99 -> alpha1 (oops) # 3.5.9{1,2} -> beta{1,2} @@ -66,7 +57,7 @@ set(SIMGRID_VERSION_MINOR "12") set(SIMGRID_VERSION_PATCH "0") set(SIMGRID_VERSION_EXTRA "-devel") # Extra words to add to version string (e.g. -rc1) -set(SIMGRID_VERSION_DATE "2014") # Year for copyright information +set(SIMGRID_VERSION_DATE "2015") # Year for copyright information if(${SIMGRID_VERSION_PATCH} EQUAL "0") set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}") @@ -198,7 +189,9 @@ if(WIN32) if(NSIS_WIN_VERSION MATCHES "") set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITECTURE}) endif() - string(TOLOWER ${NSIS_WIN_VERSION} NSIS_WIN_VERSION) + if(${NSIS_WIN_VERSION}) + string(TOLOWER ${NSIS_WIN_VERSION} NSIS_WIN_VERSION) + endif() set(_XBT_WIN32 1)