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

Fix CDB detection

Browse Source 
To make sure CDB is really installed on a Windows Kit, we need to assure the
'inc' subdirectory is present. Before this patch, if, for instance, the
Windows 8.1 kit is present (including a Debuggers subdirectory), but without
CDB, the first test under "32-bit" qmake will yield a false positive,
preventing the following 32-bit kits to be tested, then to fail under the
64-bit qmake test because the 'inc' directory is inexistent, finally
bringing about an empty CDB_PATH variable.

Change-Id: I1d7cf3350f4a63a556ef106faa5b3f0593dcf8c8
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Rafael Roquetto
2016-10-28 14:38:20 -02:00
committed by David Schulz
parent 11dd0f4c6f
commit 501bf4918f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/qtcreatorcdbext/cdb_detect.pri
View File

@@ -14,9 +14,9 @@ msvc {
# Starting from Windows SDK 8, the headers and libs are under 'ProgramFiles (x86)'. # Starting from Windows SDK 8, the headers and libs are under 'ProgramFiles (x86)'.
# The libraries are under 'ProgramFiles'as well, so, check for existence of 'inc'. # The libraries are under 'ProgramFiles'as well, so, check for existence of 'inc'.
# 32bit qmake: # 32bit qmake:
!exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Windows Kits/8.0/Debuggers" !exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles)/Windows Kits/8.0/Debuggers"
!exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Windows Kits/8.1/Debuggers" !exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles)/Windows Kits/8.1/Debuggers"
!exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Windows Kits/10/Debuggers" !exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles)/Windows Kits/10/Debuggers"
# 64bit qmake: # 64bit qmake:
!exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles) (x86)/Windows Kits/8.0/Debuggers" !exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles) (x86)/Windows Kits/8.0/Debuggers"
!exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles) (x86)/Windows Kits/8.1/Debuggers" !exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles) (x86)/Windows Kits/8.1/Debuggers"