summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/ctest_testcase.prf
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-04-12 12:53:13 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-04-12 12:53:13 +0200
commitaa3754d1058c08b18dc5c3f38ca9496ce152c584 (patch)
treef2df5de02aab5d82a75e63c54f1bb9882ff89583 /mkspecs/features/ctest_testcase.prf
parenta12a67c820fb010bc0396233528d652b717842e6 (diff)
parent8c81b282f8e18897257b93cb3fc149d74441c40e (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'mkspecs/features/ctest_testcase.prf')
-rw-r--r--mkspecs/features/ctest_testcase.prf10
1 files changed, 6 insertions, 4 deletions
diff --git a/mkspecs/features/ctest_testcase.prf b/mkspecs/features/ctest_testcase.prf
index 7faf738d6e..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)
@@ -53,9 +57,6 @@ isEmpty(CMAKE_VERSION) {
dependentmodules -= $$CMAKE_QT_MODULES_UNDER_TEST
dependentmodules = $$cmakeModuleList($$dependentmodules)
- SET = set
- equals(QMAKE_DIR_SEP, "/"):SET = export
-
CMAKE_MODULE_VERSIONS =
CMAKE_MODULES_UNDER_TEST =
for (MODULE_UNDER_TEST, CMAKE_QT_MODULES_UNDER_TEST) {
@@ -69,8 +70,9 @@ isEmpty(CMAKE_VERSION) {
CMAKE_MODULES_UNDER_TEST = $$join(CMAKE_MODULES_UNDER_TEST, ;)
check.commands = \
- $(MKDIR) $$BUILD_DIR && cd $$BUILD_DIR && $$SET VERBOSE=1 && \
+ $(MKDIR) $$BUILD_DIR && cd $$BUILD_DIR && \
cmake $$_PRO_FILE_PWD_ $$CMAKE_GENERATOR \
+ -DCMAKE_VERBOSE_MAKEFILE=1 \
$$CMAKE_MODULE_DEFINES \
-DCMAKE_BUILD_TYPE=$${CMAKE_BUILD_TYPE} \
-DCMAKE_PREFIX_PATH=$$CMAKE_PREFIX_PATH \