diff options
| -rwxr-xr-x | scripts/update_deps.py | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/update_deps.py b/scripts/update_deps.py index 47810a00..7d300865 100755 --- a/scripts/update_deps.py +++ b/scripts/update_deps.py @@ -498,7 +498,7 @@ class GoodRepo(object): # Use the CMake -A option to select the platform architecture # without needing a Visual Studio generator. - if platform.system() == 'Windows' and self._args.generator != "Ninja": + if platform.system() == 'Windows' and not self._args.generator in ["Ninja", "MinGW Makefiles"]: cmake_cmd.append('-A') if self._args.arch.lower() == '64' or self._args.arch == 'x64' or self._args.arch == 'win64': cmake_cmd.append('x64') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8a35ae36..a1b7250f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -29,6 +29,11 @@ if (ANDROID) return() endif() +# Testing isn't supported with mingw +if (MINGW) + return() +endif() + find_package(VulkanLoader CONFIG) find_package(GTest REQUIRED CONFIG QUIET) |
