diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-08-07 16:14:56 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-08-07 23:53:21 +0300 |
| commit | 02ea08ba66f5f9f076f205fca756fc8ebdd96f0f (patch) | |
| tree | 54f683af717a09b33778074f4f8b94c5072cace5 | |
| parent | 2e4a2bb373b08a9e053d7aff3205badc74a0823a (diff) | |
| download | meson-02ea08ba66f5f9f076f205fca756fc8ebdd96f0f.zip meson-02ea08ba66f5f9f076f205fca756fc8ebdd96f0f.tar.gz meson-02ea08ba66f5f9f076f205fca756fc8ebdd96f0f.tar.bz2 | |
cmake: make the traceparser permissive by default (fixes #7501)
| -rw-r--r-- | mesonbuild/cmake/traceparser.py | 2 | ||||
| -rw-r--r-- | test cases/linuxlike/13 cmake dependency/cmake/FindSomethingLikeZLIB.cmake | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/cmake/traceparser.py b/mesonbuild/cmake/traceparser.py index fd16c75..98b56f5 100644 --- a/mesonbuild/cmake/traceparser.py +++ b/mesonbuild/cmake/traceparser.py @@ -74,7 +74,7 @@ class CMakeGeneratorTarget(CMakeTarget): self.working_dir = None # type: T.Optional[str] class CMakeTraceParser: - def __init__(self, cmake_version: str, build_dir: str, permissive: bool = False): + def __init__(self, cmake_version: str, build_dir: str, permissive: bool = True): self.vars = {} # type: T.Dict[str, T.List[str]] self.targets = {} # type: T.Dict[str, CMakeTarget] diff --git a/test cases/linuxlike/13 cmake dependency/cmake/FindSomethingLikeZLIB.cmake b/test cases/linuxlike/13 cmake dependency/cmake/FindSomethingLikeZLIB.cmake index d19f7e8..483926c 100644 --- a/test cases/linuxlike/13 cmake dependency/cmake/FindSomethingLikeZLIB.cmake +++ b/test cases/linuxlike/13 cmake dependency/cmake/FindSomethingLikeZLIB.cmake @@ -4,6 +4,9 @@ include(CMakeFindDependencyMacro) include(CheckCXXSourceRuns) include(CheckCSourceRuns) +# Do something stupid (see https://github.com/mesonbuild/meson/issues/7501) +set("") + check_cxx_source_runs( " #include <iostream> |