diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-01-15 16:01:40 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-01-23 20:57:17 +0100 |
| commit | bc27ebacc92fe0bc69bf6763533aca70850db02e (patch) | |
| tree | 5aaaa61352440ed71b14620e87e30c8ba1daa00a /mesonbuild/cmake | |
| parent | a11a28a98849e857c60a35e5cdecfc3a6ee49105 (diff) | |
| download | meson-bc27ebacc92fe0bc69bf6763533aca70850db02e.zip meson-bc27ebacc92fe0bc69bf6763533aca70850db02e.tar.gz meson-bc27ebacc92fe0bc69bf6763533aca70850db02e.tar.bz2 | |
cmake: Always Add C, CXX if no language is specified (fixes #6441)
Diffstat (limited to 'mesonbuild/cmake')
| -rw-r--r-- | mesonbuild/cmake/__init__.py | 3 | ||||
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/cmake/__init__.py b/mesonbuild/cmake/__init__.py index 5520ae3..01cc3f9 100644 --- a/mesonbuild/cmake/__init__.py +++ b/mesonbuild/cmake/__init__.py @@ -25,6 +25,7 @@ __all__ = [ 'CMakeTraceLine', 'CMakeTraceParser', 'parse_generator_expressions', + 'language_map', ] from .common import CMakeException @@ -32,5 +33,5 @@ from .client import CMakeClient from .executor import CMakeExecutor from .fileapi import CMakeFileAPI from .generator import parse_generator_expressions -from .interpreter import CMakeInterpreter +from .interpreter import CMakeInterpreter, language_map from .traceparser import CMakeTarget, CMakeTraceLine, CMakeTraceParser diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 9155d6d..703815e 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -79,6 +79,8 @@ language_map = { 'c': 'C', 'cpp': 'CXX', 'cuda': 'CUDA', + 'objc': 'OBJC', + 'objcpp': 'OBJCXX', 'cs': 'CSharp', 'java': 'Java', 'fortran': 'Fortran', |