Skip to content

Commit

Permalink
Removed the "expand" section of rapidjson.mpb
Browse files Browse the repository at this point in the history
Expanding the variable here is useful because it provides a default
value when RAPIDJSON_ROOT is not set in the environment.

However, it always results in makefiles that hard-code the expansion
value (absolute path to rapidjson, may be in DDS_ROOT).

With this change, if the MPC feature no_rapidjson is 0 then the
RAPIDJSON_ROOT environment variable needs to be set either by
the configure script or manually.
  • Loading branch information
mitza-oci committed Jun 28, 2024
1 parent 862e1ee commit becb9e9
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions MPC/config/rapidjson.mpb
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
project {
avoids += no_rapidjson

expand(RAPIDJSON_ROOT) {
$RAPIDJSON_ROOT
$(DDS_ROOT)/tools/rapidjson
}
includes += $(RAPIDJSON_ROOT)/include
macros += OPENDDS_RAPIDJSON
}

0 comments on commit becb9e9

Please sign in to comment.