[simix] Use Task instead of std::package_task for timer callbacks

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 579a485..6153d2d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,7 @@ if(APPLE AND (CMAKE_C_COMPILER_VERSION VERSION_LESS "4.6"))
 endif()
 
 ### SMPI vs. Fortran
-if ((NOT DEFINED enable_smpi OR enable_smpi) AND NOT APPLE) # smpi is enabled by default
+if (enable_fortran AND (NOT DEFINED enable_smpi OR enable_smpi) AND NOT APPLE) # smpi is enabled by default
   # Call enable_language(Fortran) in order to load the build rules for this language, needed by 
   # teshsuite/smpi/mpich-test/.  Use CMAKE_FORCE_Fortran_COMPILER to bypass checks for a working compiler (smpiff 
   # doesn't exist at configure time).
@@ -383,7 +383,11 @@ if (enable_model-checking AND enable_ns3)
 endif()
 
 if(enable_smpi)
-  include(FindGFortran)
+  if(enable_fortran)
+    include(FindGFortran)
+  else()
+    SET(SMPI_FORTRAN 0)
+  endif()
   SET(HAVE_SMPI 1)
   if("${CMAKE_SYSTEM}" MATCHES "Linux")
     SET(USE_LIBUTIL 0)