From 55c56fd3864113c966d73617d7185f27ab4ec523 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 30 Jul 2012 14:41:43 +0200 Subject: [PATCH] Detect CDB within Windows SDK 8. Change-Id: I4046c44deb47cf27d1da597dd25e14a62bdbb59e Reviewed-by: Tobias Hunger --- src/libs/qtcreatorcdbext/cdb_detect.pri | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libs/qtcreatorcdbext/cdb_detect.pri b/src/libs/qtcreatorcdbext/cdb_detect.pri index d6b6df07973..c1eb45fc785 100644 --- a/src/libs/qtcreatorcdbext/cdb_detect.pri +++ b/src/libs/qtcreatorcdbext/cdb_detect.pri @@ -11,5 +11,11 @@ win32-msvc* { !exists($$CDB_PATH):CDB_PATH="$$(ProgramW6432)/Debugging Tools For Windows (x86)/sdk" !exists($$CDB_PATH):CDB_PATH="$$(ProgramW6432)/Debugging Tools For Windows (x64)/sdk" !exists($$CDB_PATH):CDB_PATH="$$(ProgramW6432)/Debugging Tools For Windows 64-bit/sdk" - !exists($$CDB_PATH)::CDB_PATH="" +# 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'. +# 32bit qmake: + !exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Windows Kits/8.0/Debuggers" +# 64bit qmake: + !exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles) (x86)/Windows Kits/8.0/Debuggers" + !exists($$CDB_PATH/inc):CDB_PATH="" }