From 09c3a29cb42d2e4f40dab933d0c45be9e6b6309b Mon Sep 17 00:00:00 2001 From: degomme Date: Fri, 24 Jun 2016 16:22:40 +0200 Subject: [PATCH 1/1] add option to remove fortran support of SMPI, even if compiler is present --- CMakeLists.txt | 8 ++++++-- tools/cmake/Option.cmake | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 579a485232..6153d2d582 100644 --- 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) diff --git a/tools/cmake/Option.cmake b/tools/cmake/Option.cmake index 5a74f55230..ed85275f1c 100644 --- a/tools/cmake/Option.cmake +++ b/tools/cmake/Option.cmake @@ -47,6 +47,7 @@ option(enable_smpi_ISP_testsuite "Whether the test suite from ISP should be buil # Internal targets used by jenkins ### +option(enable_fortran "Whether fortran is used with SMPI. Turend on by default if gfortran is found." on) option(enable_coverage "Whether coverage should be enabled." off) mark_as_advanced(enable_coverage) option(enable_memcheck "Enable memcheck." off) -- 2.20.1