Force CMake projects to be generated as if the user provided -use_env on the command line.

2 files changed, 7 insertions, 1 deletions

diff --git a/modules/CMakeProjectCreator.pm b/modules/CMakeProjectCreator.pm
index 86f99743..7ac73640 100644
--- a/modules/CMakeProjectCreator.pm
+++ b/modules/CMakeProjectCreator.pm
@@ -54,6 +54,12 @@ sub need_to_write_project {
   return $status;
 }
 
+sub get_use_env {
+  ## Override the option getter so that, for CMake, MPC always functions as
+  ## if the -use_env option was supplied on the command line.
+  return 1;
+}
+
 sub pre_write_output_file {
   my $self = shift;
   return $self->combine_custom_types();
diff --git a/modules/Creator.pm b/modules/Creator.pm
index 1d70dabe..00c64eac 100644
--- a/modules/Creator.pm
+++ b/modules/Creator.pm
@@ -1327,7 +1327,7 @@ sub get_initial_relative_values {
 
 sub get_secondary_relative_values {
   my $self = shift;
-  return ($self->{'use_env'} ? \%ENV :
+  return ($self->get_use_env() ? \%ENV :
                                $self->{'relative'}), $self->{'expand_vars'};
 }