diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-04-17 14:41:29 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-17 22:14:19 +0200 |
| commit | bcc14954d3f13f3d32ab974344d243b175a162e1 (patch) | |
| tree | f3a73ad921b72159f9b0c33b13853b5c5f15f17f /tests | |
| parent | 333817b9cf1304cca7c1dbd45880115cd128f60e (diff) | |
Update test exclusion following bug fix in recent cmake versions.
Change-Id: I8174ca78b4e2d8b4344278acf8ca4b0db3115d1a
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index ad31956f62..77cf81989a 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -70,8 +70,8 @@ if (NOT NO_DBUS) expect_pass(test_dbus_module) endif() expect_pass(test_multiple_find_package) -if (NOT WIN32) - # Currently broken on windows. Reported upstream: +if (NOT WIN32 OR (WIN32 AND NOT CMAKE_VERSION VERSION_LESS 2.8.11)) + # Broken on windows on earlier CMake versions. # http://public.kitware.com/Bug/view.php?id=13392 expect_pass(test_add_resources_delayed_file) endif() |