diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-04-10 15:01:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-10 21:11:15 +0200 |
| commit | aeaab5210ff4599026fe4324956350a6ef1aeec0 (patch) | |
| tree | 2d1291a719edadc7a82fd46301e1d505d50d5bba | |
| parent | f29b7935087f0fcc31f29652e27a45e0b51f573d (diff) | |
Generate Win64 code when testing 64bit Qt on Windows.
This should fix the issue reported here:
http://thread.gmane.org/gmane.comp.lib.qt.devel/10746
From:
http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/6590/focus=6593
Change-Id: I523de5c1a89f08bd832a684fcff7c57565ebc5c9
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| -rw-r--r-- | mkspecs/features/ctest_testcase.prf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mkspecs/features/ctest_testcase.prf b/mkspecs/features/ctest_testcase.prf index 9e24e1c6c2..c88fc961cf 100644 --- a/mkspecs/features/ctest_testcase.prf +++ b/mkspecs/features/ctest_testcase.prf @@ -38,6 +38,10 @@ isEmpty(CMAKE_VERSION) { CMAKE_BUILD_TYPE = Debug CONFIG(release, debug|release):CMAKE_BUILD_TYPE = Release win32-g++*:CMAKE_GENERATOR = -G \"MinGW Makefiles\" + win32:equals(QT_ARCH, x86_64) { + win32-msvc2010:CMAKE_GENERATOR = -G \"Visual Studio 10 Win64\" + win32-msvc2012:CMAKE_GENERATOR = -G \"Visual Studio 11 Win64\" + } BUILD_DIR = $$replace($$list($$OUT_PWD/build), /, $$QMAKE_DIR_SEP) |