cleaning and trimming

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6153d2d..e60e45a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,8 +60,19 @@ 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
+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).
@@ -82,6 +93,7 @@ if (enable_fortran AND (NOT DEFINED enable_smpi OR enable_smpi) AND NOT APPLE) #
   endif()
   CMAKE_FORCE_Fortran_COMPILER(smpiff smpiff)
   enable_language(Fortran OPTIONAL)
+  endif()
 endif()
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
@@ -165,8 +177,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 +394,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)