Skip to content

Commit

Permalink
Adds Boost:MPI configuration check when enabled
Browse files Browse the repository at this point in the history
The mpi.jam file is patched to enable the error
  • Loading branch information
oleurodecision committed Sep 7, 2020
1 parent e7a268c commit f77c87c
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
2 changes: 2 additions & 0 deletions recipes/boost/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ patches:
base_path: "source_subfolder"
- patch_file: "patches/boost_log_filesystem_no_deprecated_1_72.patch"
base_path: "source_subfolder"
- patch_file: "patches/boost_mpi_check.patch"
base_path: "source_subfolder"
1.73.0:
- patch_file: "patches/boost_build_qcc_fix_debug_build_parameter.patch"
base_path: "source_subfolder"
Expand Down
24 changes: 24 additions & 0 deletions recipes/boost/all/patches/boost_mpi_check.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff -ru a/tools/build/src/tools/mpi.jam b/tools/build/src/tools/mpi.jam
--- a/tools/build/src/tools/mpi.jam 2019-12-10 01:20:16.000000000 +0100
+++ b/tools/build/src/tools/mpi.jam 2020-09-02 13:17:22.942349254 +0200
@@ -66,6 +66,8 @@
import type ;
import path ;

+import errors ;
+
# Make this module a project
project.initialize $(__name__) ;
project mpi ;
@@ -539,6 +541,11 @@
# Set up the "mpi" alias
alias mpi : : : : $(options) ;
}
+
+ if ! $(.configured)
+ {
+ errors.user-error "MPI not configured" ;
+ }
}

# States whether MPI has bee configured

0 comments on commit f77c87c

Please sign in to comment.