Skip to content

Commit 7f35091

Browse files
committed
Fixing build error when MPI is set but not found
1 parent fb5e59e commit 7f35091

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

bsbash/find_functions.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,13 @@ FIND_MPI () {
115115
MPI_INCLUDE_PATH=''
116116
fi
117117

118+
if [ ! -d "$MPI_INCLUDE_PATH" ] || [ ! -d "$MPI_LIBRARY_PATH" ]; then
119+
MPI_FOUND=''
120+
MPI_INCLUDE_PATH=''
121+
MPI_LIBRARY_PATH=''
122+
MPI_LIBRARIES=''
123+
fi
124+
118125
export MPI_FOUND
119126
export MPI_LIBRARIES
120127
export MPI_LIBRARY_PATH

build.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,25 +222,25 @@ if [ -n "$COMPILE_MPI" ]; then
222222
if [ -n "$MPI_INCLUDE_PATH" ]; then
223223
INCLUDE_P="-I$MPI_INCLUDE_PATH"
224224
fi
225-
COMPILE_EXECUTABLE "MonoAlg3D_batch" "$SRC_FILES" "$HDR_FILES" "$STATIC_DEPS" "$DYNAMIC_DEPS" "$EXTRA_LIB_PATH" "$INCLUDE_P"
225+
COMPILE_EXECUTABLE "MonoAlg3D_batch" "$SRC_FILES" "$HDR_FILES" "$STATIC_DEPS" "$DYNAMIC_DEPS" "$CUDA_LIBRARY_PATH $EXTRA_LIB_PATH" "$INCLUDE_P"
226226
fi
227227

228228
fi
229229

230230
if [ -n "$COMPILE_GUI" ]; then
231-
COMPILE_EXECUTABLE "MonoAlg3D_visualizer" "src/main_visualizer.c" "" "$STATIC_DEPS" "$DYNAMIC_DEPS" "$EXTRA_LIB_PATH $LIBRARY_OUTPUT_DIRECTORY"
231+
COMPILE_EXECUTABLE "MonoAlg3D_visualizer" "src/main_visualizer.c" "" "$STATIC_DEPS" "$DYNAMIC_DEPS" "$CUDA_LIBRARY_PATH $EXTRA_LIB_PATH $LIBRARY_OUTPUT_DIRECTORY"
232232
fi
233233

234234
if [ -n "$COMPILE_CONVERTER" ]; then
235-
COMPILE_EXECUTABLE "MonoAlg3D_converter" "src/main_converter.c" "" "$STATIC_DEPS" "$DYNAMIC_DEPS" "$EXTRA_LIB_PATH $LIBRARY_OUTPUT_DIRECTORY"
235+
COMPILE_EXECUTABLE "MonoAlg3D_converter" "src/main_converter.c" "" "$STATIC_DEPS" "$DYNAMIC_DEPS" "$CUDA_LIBRARY_PATH $EXTRA_LIB_PATH $LIBRARY_OUTPUT_DIRECTORY"
236236
fi
237237

238238
if [ -n "$COMPILE_FIBER_CONVERTER" ]; then
239-
COMPILE_EXECUTABLE "MonoAlg3D_fiber_converter" "src/main_fiber_converter.c" "" "$STATIC_DEPS" "$DYNAMIC_DEPS" "$EXTRA_LIB_PATH $LIBRARY_OUTPUT_DIRECTORY"
239+
COMPILE_EXECUTABLE "MonoAlg3D_fiber_converter" "src/main_fiber_converter.c" "" "$STATIC_DEPS" "$DYNAMIC_DEPS" "$CUDA_LIBRARY_PATH $EXTRA_LIB_PATH $LIBRARY_OUTPUT_DIRECTORY"
240240
fi
241241

242242
if [ -n "$COMPILE_POSTPROCESSOR" ]; then
243-
COMPILE_EXECUTABLE "MonoAlg3D_postprocessor" "src/main_postprocessor.c" "" "$STATIC_DEPS" "$DYNAMIC_DEPS" "$EXTRA_LIB_PATH $LIBRARY_OUTPUT_DIRECTORY"
243+
COMPILE_EXECUTABLE "MonoAlg3D_postprocessor" "src/main_postprocessor.c" "" "$STATIC_DEPS" "$DYNAMIC_DEPS" "$CUDA_LIBRARY_PATH $EXTRA_LIB_PATH $LIBRARY_OUTPUT_DIRECTORY"
244244
ADD_SUBDIRECTORY "src/postprocessing_library/"
245245
fi
246246

0 commit comments

Comments
 (0)