X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/705e31613e6196f6a7712dfdb718fa13112e8dbe..9d86882c3a4661111f289a034783ab36f5c32d92:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 025cc9c0ba..309485224e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 # Java requires 2.8.6
+message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
 
 project(SimGrid C CXX)
 
@@ -14,9 +15,12 @@ endif()
 
 ## 
 ## Check the C/C++ standard that we need
-##   See also tools/cmake/Flags.cmake that sets our paranoid warning flags
+##   See also tools/cmake/GCCFlags.cmake that sets our paranoid warning flags
 if (MSVC)
-  message("MicroSoft Visual C detected.")
+  message("-- You are compiling SimGrid with MicroSoft Visual C. Good luck.")
+
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_SCL_SECURE_NO_WARNINGS")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_SCL_SECURE_NO_WARNINGS")
 else() # gcc or clang
   INCLUDE(CheckCCompilerFlag)
   CHECK_C_COMPILER_FLAG(-fstack-cleaner HAVE_C_STACK_CLEANER)
@@ -93,7 +97,7 @@ endif()
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "12")
+set(SIMGRID_VERSION_MINOR "13")
 set(SIMGRID_VERSION_PATCH "0")
 set(SIMGRID_VERSION_EXTRA "-devel") # Extra words to add to version string (e.g. -rc1)
 
@@ -137,11 +141,6 @@ 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("VB is not yet supported by Simgrid. Proceed with extrem caution")
-endif()
-
 ### Find programs and paths
 FIND_PROGRAM(GCOV_PATH gcov)
 include(FindPerl)
@@ -170,7 +169,6 @@ set(INCLUDES
 if(WIN32)
   set(INCLUDES ${INCLUDES} ${CMAKE_HOME_DIRECTORY}/include/xbt ${CMAKE_HOME_DIRECTORY}/src/xbt) #for win32_ucontext.[ch]
 endif()
-set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
 
 if(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)
   set(INCLUDES ${INCLUDES} /usr/include/)
@@ -178,7 +176,11 @@ endif()
 
 ### Check 32bits or 64bits
 INCLUDE (CheckTypeSize)
+CHECK_TYPE_SIZE("int" SIZEOF_INT)
+CHECK_TYPE_SIZE("long" SIZEOF_LONG)
+CHECK_TYPE_SIZE("long long" SIZEOF_LONGLONG)
 CHECK_TYPE_SIZE("void*" SIZEOF_VOIDSTAR)
+message ("   Data model: (int)=${SIZEOF_INT} (long)=${SIZEOF_LONG} (long long)=${SIZEOF_LONGLONG} (void*)=${SIZEOF_VOIDSTAR}")
 IF(SIZEOF_VOIDSTAR EQUAL 4)
   SET(ARCH_32_BITS 1)
 ELSE()
@@ -207,8 +209,6 @@ if(WIN32)
     if(COMPILER_C_MINOR_VERSION)
       # set(__GNUC_MINOR__ ${COMPILER_C_MINOR_VERSION})
     endif()
-  else()
-    message("You REALLY should use MinGW to compile SimGrid on Windows!")
   endif()
 
   set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITEW6432})
@@ -249,8 +249,10 @@ include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake)
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MaintainerMode.cmake)
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/UnitTesting.cmake)
 
-### Setup gcc flags
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Flags.cmake)
+### Setup gcc & clang flags
+if (NOT MSVC)
+  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GCCFlags.cmake)
+endif()
 
 ### Make Libs
 if(NOT WIN32)
@@ -260,31 +262,39 @@ else()
 endif()
 
 if(enable_java)
-  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeJava.cmake)
+  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Java.cmake)
 endif()
 
-### Make Exes
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeExe.cmake)
-
 ### Make tests
 if(enable_memcheck_xml)
   set(enable_memcheck true)
 endif()
 
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/AddTests.cmake)
+INCLUDE(CTest)
+ENABLE_TESTING()
+include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Tests.cmake)
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestConfig.cmake)
 
+### Define subdirectories
+include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeExe.cmake)
+
 ### Setup the distrib
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Distrib.cmake)
 
-### Pipol compilation
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Pipol.cmake)
-
-### Build the doc
+### Build the doc (Windows downloads the doc instead of regenerating)
+#
 if(NOT WIN32)
-  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GenerateDoc.cmake)
+  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Documentation.cmake)
 else()
-  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/GenerateDocWin.cmake)
+  find_program(WGET_PROGRAM  NAMES wget)
+  message(STATUS "wget: ${WGET_PROGRAM}")
+  if(WGET_PROGRAM)
+    ADD_CUSTOM_TARGET(simgrid_documentation
+      COMMENT "Downloading the SimGrid documentation..."
+      COMMAND ${WGET_PROGRAM} -r -np -nH -nd http://simgrid.gforge.inria.fr/simgrid/${release_version}/doc/
+      WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/html
+    )
+  endif()
 endif()
 
 ### Print ARGS