Get builtin options by correct name in subprojects.

mesonbuild · Jun 30, 2015 · ac127db · ac127db
1 parent 6f76c45
commit ac127db
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/coredata.py b/coredata.py
@@ -16,6 +16,20 @@
 
 version = '0.25.0-research'
 
+builtin_options = {'buildtype': True,
+                          'strip': True,
+                          'coverage': True,
+                          'pch': True,
+                          'unity': True,
+                          'prefix': True,
+                          'libdir' : True,
+                          'bindir' : True,
+                          'includedir' : True,
+                          'datadir' : True,
+                          'mandir' : True,
+                          'localedir' : True,
+                          'werror' : True,
+                         }
 # This class contains all data that must persist over multiple
 # invocations of Meson. It is roughly the same thing as
 # cmakecache.

diff --git a/interpreter.py b/interpreter.py
@@ -1130,7 +1130,7 @@ def func_get_option(self, nodes, args, kwargs):
         if len(args) != 1:
             raise InterpreterException('Argument required for get_option.')
         optname = args[0]
-        if self.is_subproject():
+        if optname not in coredata.builtin_options and self.is_subproject():
             optname = self.subproject + ':' + optname
         try:
             return self.environment.get_coredata().get_builtin_option(optname)

diff --git a/optinterpreter.py b/optinterpreter.py
@@ -16,20 +16,7 @@
 import coredata
 import os, re
 
-forbidden_option_names = {'buildtype': True,
-                          'strip': True,
-                          'coverage': True,
-                          'pch': True,
-                          'unity': True,
-                          'prefix': True,
-                          'libdir' : True,
-                          'bindir' : True,
-                          'includedir' : True,
-                          'datadir' : True,
-                          'mandir' : True,
-                          'localedir' : True,
-                          'werror' : True,
-                         }
+forbidden_option_names = coredata.builtin_options
 
 class OptionException(coredata.MesonException):
     pass