diff options
| author | Matthieu Bouron <matthieu.bouron@gmail.com> | 2023-04-11 10:21:55 +0200 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2023-04-24 11:41:55 -0400 |
| commit | 09ec4f6e225fb1634a800a58c28a87fe3733b343 (patch) | |
| tree | 622cbdfb543fbc3bfced2efd71914d296460a4df /test cases/frameworks | |
| parent | 18cfa545f03ddb6cb8378fdadec4f284aa7ea221 (diff) | |
| download | meson-09ec4f6e225fb1634a800a58c28a87fe3733b343.tar.gz | |
dependencies: allow to fallback on CMake to find the SDL2 library
On Windows, the SDL2 library is generally provided with only CMake config
files. This commit allows meson to fallback on CMake as a last resort to
find the SDL2 library.
Diffstat (limited to 'test cases/frameworks')
| -rw-r--r-- | test cases/frameworks/16 sdl2/meson_options.txt | 2 | ||||
| -rw-r--r-- | test cases/frameworks/16 sdl2/test.json | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test cases/frameworks/16 sdl2/meson_options.txt b/test cases/frameworks/16 sdl2/meson_options.txt index 176af1775..039a3f52c 100644 --- a/test cases/frameworks/16 sdl2/meson_options.txt +++ b/test cases/frameworks/16 sdl2/meson_options.txt @@ -1,6 +1,6 @@ option( 'method', type : 'combo', - choices : ['auto', 'pkg-config', 'config-tool', 'sdlconfig', 'extraframework'], + choices : ['auto', 'pkg-config', 'config-tool', 'sdlconfig', 'extraframework', 'cmake'], value : 'auto', ) diff --git a/test cases/frameworks/16 sdl2/test.json b/test cases/frameworks/16 sdl2/test.json index 57a3f21b6..ee4112ae3 100644 --- a/test cases/frameworks/16 sdl2/test.json +++ b/test cases/frameworks/16 sdl2/test.json @@ -6,7 +6,8 @@ { "val": "pkg-config" }, { "val": "config-tool" }, { "val": "sdlconfig" }, - { "val": "extraframework", "skip_on_os": ["!darwin"], "skip_on_jobname": ["macos"] } + { "val": "extraframework", "skip_on_os": ["!darwin"], "skip_on_jobname": ["macos"] }, + { "val": "cmake", "skip_on_jobname": ["bionic"] } ] } }, |