diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2019-09-16 12:41:43 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-17 17:11:59 +0000 |
| commit | 89e347ba4232f1d7b1d7c9def6c7249850b01602 (patch) | |
| tree | ba9a7a20ac73f641e3ac246afc15ed0f2e6f2556 /tests/auto/tools | |
| parent | 17e11745f1ec9611f44bf821cb08a926d1242a65 (diff) | |
Fix for getting windows running tests
By adding the path to the DLLs early on in the path. This fixes the
issue seen in CI (0xc0000135, DLL not found) and resolves local issues
where you might have forgotten to add this to path yourself potentially
grabbing libraries from elsewhere.
The ${path} seems to be a holdover that is no longer used, so it was
removed while the code was changed anyway.
Also disable WIN32_EXECUTABLE for all tests so that we can actually get
some output from them :)
Change-Id: Iec42c809c37be4f31c7f0a7af3a30c3528022dbe
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'tests/auto/tools')
| -rw-r--r-- | tests/auto/tools/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/tools/CMakeLists.txt b/tests/auto/tools/CMakeLists.txt index c546da967f..aa45587993 100644 --- a/tests/auto/tools/CMakeLists.txt +++ b/tests/auto/tools/CMakeLists.txt @@ -1,7 +1,11 @@ # Generated from tools.pro. add_subdirectory(qmakelib) -add_subdirectory(qmake) +# special case begin +if(NOT WIN32) # @todo: this is broken, see QTBUG-78449 + add_subdirectory(qmake) +endif() +# special case end #add_subdirectory(moc) #add_subdirectory(rcc) if(TARGET Qt::Widgets) |