Skip to content

Commit

Permalink
Allow to be included is ctest -S driver script (trilinos#2462)
Browse files Browse the repository at this point in the history
I just added an if statement to guard calling INCLUDE_DIRECTORIES() to allow
including in a ctest -S script.  This makes it so that the same enable/disable
options are seen in the outer ctest -S driver enable/disable logic as the
inner CMake configure.
  • Loading branch information
bartlettroscoe committed May 7, 2018
1 parent dbf51f8 commit f56094f
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions cmake/std/sems/SEMSDevEnv.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@ IF (TPL_ENABLE_MPI)
ASSERT_DEFINED(ENV{SEMS_OPENMPI_ROOT})
SET(MPI_BASE_DIR "$ENV{SEMS_OPENMPI_ROOT}" CACHE PATH
"Set in SEMSDevEnv.cmake")
# Make OpenMPI 1.6.5 mpi.h with GCC 4.8.3 warnings go away (see #1341)
INCLUDE_DIRECTORIES(SYSTEM "$ENV{SEMS_OPENMPI_ROOT}/include")
# NOTE: With TriBITS, all soruce files get built with the MPI compiler
# wrappers so it should be safe to add this include directory with -isystem
# to all builds. The only worry is Fortran 90+ code that will cause
# problems with older versions of gfortran.
IF (COMMAND INCLUDE_DIRECTORIES)
# Make OpenMPI 1.6.5 mpi.h with GCC 4.8.3 warnings go away (see #1341)
INCLUDE_DIRECTORIES(SYSTEM "$ENV{SEMS_OPENMPI_ROOT}/include")
# NOTE: With TriBITS, all soruce files get built with the MPI compiler
# wrappers so it should be safe to add this include directory with -isystem
# to all builds. The only worry is Fortran 90+ code that will cause
# problems with older versions of gfortran.
ENDIF()
ELSE()
# Set up serial non-MPI compiler wrappers
ASSERT_DEFINED(ENV{CC})
Expand Down

0 comments on commit f56094f

Please sign in to comment.