feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Tools: Fix architecture detection for wininterrupt

Browse Source 
Previously, the detection relied on the variable CPU which
is no longer set current versions of MSVC.

Use newly introduced variable VSCMD_ARG_TGT_ARCH (MSVC 2017) or
Platform (MSVC 2015) to detect 64bit.

Change-Id: I705dbd7d3d7912c36e588a5ff399e65b4ca6f500
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2018-05-22 13:33:27 +02:00
parent c908a52628
commit 760a632936
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/wininterrupt/wininterrupt.pro
View File

@@ -25,11 +25,14 @@ build_all:!build_pass {
CONFIG += release
}
ENV_CPU=$$(CPU)
# Check for VSCMD_ARG_TGT_ARCH (VS 17) or Platform=X64 (VS 13, 15)
# For older versions, fall back to hacky check on LIBPATH
ENV_TARGET_ARCH=$$(VSCMD_ARG_TGT_ARCH)
isEmpty(ENV_TARGET_ARCH):ENV_TARGET_ARCH = $$(Platform)
ENV_LIBPATH=$$(LIBPATH)
contains(ENV_CPU, ^AMD64$) {
contains(ENV_TARGET_ARCH, .*64$) {
TARGET = win64interrupt
} else:isEmpty(ENV_CPU):contains(ENV_LIBPATH, ^.*amd64.*$) {
} else:isEmpty(ENV_TARGET_ARCH):contains(ENV_LIBPATH, ^.*amd64.*$) {
TARGET = win64interrupt
} else {
TARGET = win32interrupt