Skip to content

Commit dae2605

Browse files
committed
Merge pull request #184 from torbjoernk/fix/boris_pfasst_on_sc
examples: boris: fix Boris-PFASST configuration
2 parents 3b9ca60 + 9a77531 commit dae2605

File tree

1 file changed

+10
-19
lines changed

1 file changed

+10
-19
lines changed

examples/boris/CMakeLists.txt

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,18 @@ foreach(example ${boris_examples})
3636
endif()
3737
endforeach(example)
3838

39-
if(${pfasst_WITH_MPI})
40-
include_directories(${MPI_CXX_INCLUDE_PATH})
41-
foreach(example ${boris_examples})
42-
if(MPI_COMPILE_FLAGS)
43-
set_target_properties(${example} PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}")
44-
endif()
45-
if(MPI_LINK_FLAGS)
46-
set_target_properties(${example} PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}")
39+
if(pfasst_BORIS_SAME_LEVELS)
40+
foreach(example "boris_mlsdc" "boris_pfasst")
41+
if(TARGET ${example})
42+
get_target_property(definitions ${example} COMPILE_DEFINITIONS)
43+
if(${definitions})
44+
list(APPEND definitions "BORIS_SAME_LEVELS")
45+
else()
46+
set(definitions "BORIS_SAME_LEVELS")
47+
endif()
48+
set_target_properties(${example} PROPERTIES COMPILE_DEFINITIONS ${definitions})
4749
endif()
48-
target_link_libraries(${example} ${MPI_CXX_LIBRARIES})
4950
endforeach(example)
50-
else()
51-
if(pfasst_BORIS_SAME_LEVELS)
52-
get_target_property(boris_mlsdc_definitions boris_mlsdc COMPILE_DEFINITIONS)
53-
if(${boris_mlsdc_definitions})
54-
list(APPEND boris_mlsdc_definitions "BORIS_SAME_LEVELS")
55-
else()
56-
set(boris_mlsdc_definitions "BORIS_SAME_LEVELS")
57-
endif()
58-
set_target_properties(boris_mlsdc PROPERTIES COMPILE_DEFINITIONS ${boris_mlsdc_definitions})
59-
endif()
6051
endif()
6152

6253

0 commit comments

Comments
 (0)