From 71ae9b4b35e8460752fe463d175c468d4b27238e Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 6 Mar 2014 12:28:48 +0100 Subject: CMake: Test with the NMake Makefiles generator on Windows. It may be much faster through the CI system that way. Change-Id: Ib5e3a438bd2ac98dd0a3806cedba152f25e219d5 Reviewed-by: Friedemann Kleint --- mkspecs/features/ctest_testcase_common.prf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/ctest_testcase_common.prf b/mkspecs/features/ctest_testcase_common.prf index a2b7e8e72b..b98a613f55 100644 --- a/mkspecs/features/ctest_testcase_common.prf +++ b/mkspecs/features/ctest_testcase_common.prf @@ -51,11 +51,8 @@ load(cmake_functions) CMAKE_BUILD_TYPE = Debug CONFIG(release, debug|release):CMAKE_BUILD_TYPE = Release +win32: CMAKE_GENERATOR = -G \"NMake Makefiles\" mingw:isEmpty(CROSS_COMPILE):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) -- cgit v1.2.3