X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0841b4cd80e970dd2f13692db9f938e5a8f90317..f9520b353a16a117bec381dfd9688d819809a741:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6baff48f65..e90ed43bbb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ if(WIN32)
   SET(CMAKE_RC_COMPILER "windres")
 endif()
 project(SimGrid C)
-if (enable_gtnets OR enable_ns3)
+if (enable_gtnets OR enable_ns3 OR enable_model-checking)
   enable_language(CXX)
 endif()
 
@@ -35,7 +35,7 @@ if (NOT DEFINED enable_smpi OR enable_smpi) # smpi is enabled by default
 endif()
 
 set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
-set(CMAKE_CXX_FLAGS " -std=c++0x " 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)
@@ -57,7 +57,7 @@ set(SIMGRID_VERSION_MINOR "11")
 set(SIMGRID_VERSION_PATCH "0")
 set(SIMGRID_VERSION_EXTRA "-devel") # Extra words to add to version string (e.g. -rc1)
 
-set(SIMGRID_VERSION_DATE  "2013") # Year for copyright information
+set(SIMGRID_VERSION_DATE  "2014") # Year for copyright information
 
 if(${SIMGRID_VERSION_PATCH} EQUAL "0")
   set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
@@ -66,7 +66,7 @@ else()
 endif()
 
 set(SIMGRID_VERSION_STRING
-  "SimGrid version ${release_version}${SIMGRID_VERSION_EXTRA}\\nCopyright (c) ${SIMGRID_VERSION_DATE}. The Simgrid Team.")
+  "SimGrid version ${release_version}${SIMGRID_VERSION_EXTRA}\\nCopyright (c) 2004-${SIMGRID_VERSION_DATE}. The Simgrid Team.")
 
 set(libsimgrid_version "${release_version}")
 set(libsimgrid-java_version "${release_version}")
@@ -99,6 +99,9 @@ if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
   endif()
 endif()
 
+exec_program("${CMAKE_LINKER} --version" OUTPUT_VARIABLE "LINKER_VERSION")
+string(REGEX MATCH "[0-9].[0-9]*" LINKER_VERSION "${LINKER_VERSION}")
+
 string(REGEX MATCH "cl.exe" VBC "${CMAKE_C_COMPILER}")
 if(VBC)
   message(FATAL_ERROR "VB is not yet supported by Simgrid.")
@@ -170,9 +173,9 @@ if(WIN32)
     message(FATAL_ERROR "Please use MinGW to compile SimGrid!")
   endif()
 
-  if(ARCH_32_BITS)	### Arch 32bits
+  if(ARCH_32_BITS)      ### Arch 32bits
     set(_WIN32 1)
-  else()	### Arch 64bits
+  else()        ### Arch 64bits
     set(_WIN64 1)
   endif()
 
@@ -184,18 +187,18 @@ if(WIN32)
 
   set(_XBT_WIN32 1)
 
-  message(STATUS "C_COMPILER			${CMAKE_C_COMPILER} ${COMPILER_C_VERSION}")
-  message(STATUS "CXX_COMPILER			${CMAKE_CXX_COMPILER} ${COMPILER_CXX_VERSION}")
-  message(STATUS "CMAKE_RC_COMPILER		${CMAKE_RC_COMPILER}")
-  message(STATUS "INCLUDE			${CMAKE_INCLUDE_WIN}")
-  message(STATUS "LIB				${CMAKE_LIB_WIN}")
-  message(STATUS "MAKE_PROGRAM			${CMAKE_MAKE_PROGRAM}")
-  message(STATUS "CMAKE_BUILD_TOOL		${CMAKE_BUILD_TOOL}")
-  message(STATUS "LINKER			${CMAKE_LINKER}")
-  message(STATUS "CMAKE_GENERATOR		${CMAKE_GENERATOR}")
-  message(STATUS "BORLAND			${BORLAND}")
-  message(STATUS "VISUALC			${MSVC}")
-  message(STATUS "GNUC				${CMAKE_COMPILER_IS_GNUCC}")
+  message(STATUS "C_COMPILER                    ${CMAKE_C_COMPILER} ${COMPILER_C_VERSION}")
+  message(STATUS "CXX_COMPILER                  ${CMAKE_CXX_COMPILER} ${COMPILER_CXX_VERSION}")
+  message(STATUS "CMAKE_RC_COMPILER             ${CMAKE_RC_COMPILER}")
+  message(STATUS "INCLUDE                       ${CMAKE_INCLUDE_WIN}")
+  message(STATUS "LIB                           ${CMAKE_LIB_WIN}")
+  message(STATUS "MAKE_PROGRAM                  ${CMAKE_MAKE_PROGRAM}")
+  message(STATUS "CMAKE_BUILD_TOOL              ${CMAKE_BUILD_TOOL}")
+  message(STATUS "LINKER                        ${CMAKE_LINKER}")
+  message(STATUS "CMAKE_GENERATOR               ${CMAKE_GENERATOR}")
+  message(STATUS "BORLAND                       ${BORLAND}")
+  message(STATUS "VISUALC                       ${MSVC}")
+  message(STATUS "GNUC                          ${CMAKE_COMPILER_IS_GNUCC}")
 
 endif()
 
@@ -228,6 +231,10 @@ endif()
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeExe.cmake)
 
 ### Make tests
+if(enable_memcheck_xml)
+  set(enable_memcheck true)
+endif()
+
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake)
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)