From 62e2c1616bb6edf86824c466c6f82635ab6ad5e4 Mon Sep 17 00:00:00 2001 From: Dawid Jagiela Date: Fri, 31 Oct 2014 23:48:33 +0100 Subject: [PATCH] fix for multiple MPI include paths passed by MPI wrapper --- CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 54c8f7f..8d0a5d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,13 @@ MACRO (CINFO_FORMAT FN VN VD) file(APPEND ${FN} " write(iout,*)'${STR}'\n") endif(SUMA GREATER 50) ENDMACRO (CINFO_FORMAT) + +# Some MPI wrappers pass double include paths +# This macro fixes broken by semicolon occurence in path +MACRO (FIX_DBL_INCLUDE RESULT) + string(REPLACE ";" " -I" ${RESULT} "${${RESULT}}") +ENDMACRO (FIX_DBL_INCLUDE) + #====================================== # CTest stuff #======================================A @@ -86,8 +93,8 @@ SET(CMAKE_Fortran_COMPILE_OBJECT " ${CMAKE_START_TEMP_F # make sure that the default is a RELEASE if (NOT CMAKE_BUILD_TYPE) - set (CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None Debug Release." FORCE) - set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "None" "Debug" "Release" ) + set (CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo." FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "None" "Debug" "Release" "RelWithDebInfo") endif (NOT CMAKE_BUILD_TYPE) @@ -136,6 +143,7 @@ find_package(MPI QUIET) if (MPI_Fortran_FOUND) message("MPI found") + FIX_DBL_INCLUDE(MPI_Fortran_INCLUDE_PATH) else() message("MPI not found - disabling MPI compile flags ") set ( UNRES_WITH_MPI "OFF") -- 1.7.9.5