diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-06-28 13:37:02 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-06-28 13:37:02 +0200 |
| commit | 71a5ff718a8c967971bb8f9ea6e064d551f3a9eb (patch) | |
| tree | 7dab407b831e37279a1779548815d3fb9f6c27eb | |
| parent | 647d80f34cb09d5585fc690399e8aede0f4294b0 (diff) | |
| download | meson-71a5ff718a8c967971bb8f9ea6e064d551f3a9eb.tar.gz | |
cmake: Skip ARGS key in COMMAND
| -rw-r--r-- | mesonbuild/cmake/traceparser.py | 2 | ||||
| -rw-r--r-- | test cases/cmake/8 custom command/subprojects/cmMod/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/cmake/traceparser.py b/mesonbuild/cmake/traceparser.py index e9437177f..806b4fb1f 100644 --- a/mesonbuild/cmake/traceparser.py +++ b/mesonbuild/cmake/traceparser.py @@ -231,6 +231,8 @@ class CMakeTraceParser: target.outputs += [key] def handle_command(key: str, target: CMakeGeneratorTarget) -> None: + if key == 'ARGS': + return target.command[-1] += [key] def handle_depends(key: str, target: CMakeGeneratorTarget) -> None: diff --git a/test cases/cmake/8 custom command/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/8 custom command/subprojects/cmMod/CMakeLists.txt index 7143cf323..259151c2c 100644 --- a/test cases/cmake/8 custom command/subprojects/cmMod/CMakeLists.txt +++ b/test cases/cmake/8 custom command/subprojects/cmMod/CMakeLists.txt @@ -11,7 +11,7 @@ add_executable(mycpy cp.cpp) add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/genTest.cpp" "${CMAKE_CURRENT_BINARY_DIR}/genTest.hpp" - COMMAND gen genTest + COMMAND gen ARGS genTest ) add_custom_command( |