From c603367da10be1b2571a3218159fa04a58c4763b Mon Sep 17 00:00:00 2001 From: degomme Date: Tue, 28 Jun 2016 16:38:26 +0200 Subject: [PATCH] try to set fortran compiler before hacking cmake with another fake one. --- CMakeLists.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4272462fe2..c1093c6826 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,14 @@ 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 (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 +89,7 @@ if ((NOT DEFINED enable_smpi OR enable_smpi) AND NOT APPLE) # smpi is enabled by endif() CMAKE_FORCE_Fortran_COMPILER(smpiff smpiff) enable_language(Fortran OPTIONAL) + endif() endif() #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# @@ -383,11 +391,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) -- 2.20.1