X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/09c3a29cb42d2e4f40dab933d0c45be9e6b6309b..1d04f47ddcc46f37eca622ca5a343c7197115990:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6153d2d582..526bec15c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,28 +60,40 @@ if(APPLE AND (CMAKE_C_COMPILER_VERSION VERSION_LESS "4.6"))
   set(HAVE_UCONTEXT_H 0)
 endif()
 
+
+### Setup Options
+include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Option.cmake)
+
 ### SMPI vs. Fortran
-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).
-  include(CMakeForceCompiler)
-  if(NOT COMMAND CMAKE_FORCE_Fortran_COMPILER)
-    MACRO(CMAKE_FORCE_Fortran_COMPILER compiler id)
-      SET(CMAKE_Fortran_COMPILER "${compiler}")
-      SET(CMAKE_Fortran_COMPILER_ID_RUN TRUE)
-      SET(CMAKE_Fortran_COMPILER_ID ${id})
-      SET(CMAKE_Fortran_COMPILER_WORKS TRUE)
-      SET(CMAKE_Fortran_COMPILER_FORCED TRUE)
-
-      # Set old compiler id variables.
-      IF("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
-        SET(CMAKE_COMPILER_IS_GNUG77 1)
-      ENDIF("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
-    ENDMACRO(CMAKE_FORCE_Fortran_COMPILER)
+if ((NOT DEFINED enable_smpi) OR enable_smpi) 
+  if(enable_fortran)
+    include(FindGFortran)
+  else()
+    SET(SMPI_FORTRAN 0)
+  endif()
+  
+  if(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).
+    include(CMakeForceCompiler)
+    if(NOT COMMAND CMAKE_FORCE_Fortran_COMPILER)
+      MACRO(CMAKE_FORCE_Fortran_COMPILER compiler id)
+        SET(CMAKE_Fortran_COMPILER "${compiler}")
+        SET(CMAKE_Fortran_COMPILER_ID_RUN TRUE)
+        SET(CMAKE_Fortran_COMPILER_ID ${id})
+        SET(CMAKE_Fortran_COMPILER_WORKS TRUE)
+        SET(CMAKE_Fortran_COMPILER_FORCED TRUE)
+
+        # Set old compiler id variables.
+        IF("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
+          SET(CMAKE_COMPILER_IS_GNUG77 1)
+        ENDIF("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
+      ENDMACRO(CMAKE_FORCE_Fortran_COMPILER)
+    endif()
+    CMAKE_FORCE_Fortran_COMPILER(smpiff smpiff)
+    enable_language(Fortran OPTIONAL)
   endif()
-  CMAKE_FORCE_Fortran_COMPILER(smpiff smpiff)
-  enable_language(Fortran OPTIONAL)
 endif()
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
@@ -128,6 +140,12 @@ if(NOT PERL_FOUND)
   message(FATAL_ERROR "Please install Perl to compile SimGrid.")
 endif()
 
+# tesh.py needs python 3 (or the module python-subprocess32 on python2.8+)
+set(PythonInterp_FIND_VERSION 3)
+set(PythonInterp_FIND_VERSION_COUNT 1)
+set(PythonInterp_FIND_VERSION_MAJOR 3)
+include(FindPythonInterp)
+
 if (APPLE)
   set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
   set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -165,8 +183,7 @@ endif()
 
 include_directories(${INCLUDES})
 
-### Setup Options
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Option.cmake)
+
 
 ### Determine the assembly flavor that we need today
 set(HAVE_RAW_CONTEXTS 0)
@@ -383,11 +400,6 @@ if (enable_model-checking AND enable_ns3)
 endif()
 
 if(enable_smpi)
-  if(enable_fortran)
-    include(FindGFortran)
-  else()
-    SET(SMPI_FORTRAN 0)
-  endif()
   SET(HAVE_SMPI 1)
   if("${CMAKE_SYSTEM}" MATCHES "Linux")
     SET(USE_LIBUTIL 0)