From 4a58646be32a215b47ce6b7c9ffbe7b80c62dd99 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Thu, 15 Oct 2009 16:40:28 +0200
Subject: [PATCH] Accept CDB_PATH env variable as custom path to CDB
installation.
Also, shortened checks on possible CDB locations.
Reviewed-By: Friedemann Kleint
---
src/plugins/debugger/cdb/cdb.pri | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/src/plugins/debugger/cdb/cdb.pri b/src/plugins/debugger/cdb/cdb.pri
index ff877890a48..ca08a11bb61 100644
--- a/src/plugins/debugger/cdb/cdb.pri
+++ b/src/plugins/debugger/cdb/cdb.pri
@@ -4,21 +4,15 @@
win32 {
contains(QMAKE_CXX, cl) {
-CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows/sdk"
+CDB_PATH=$$(CDB_PATH)
+isEmpty($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows/sdk"
-!exists ($$CDB_PATH) {
- CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows (x86)/sdk"
-}
+!exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows (x86)/sdk"
+!exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows (x64)/sdk"
+!exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows 64-bit/sdk"
-!exists ($$CDB_PATH) {
- CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows (x64)/sdk"
-}
+exists($$CDB_PATH) {
-!exists ($$CDB_PATH) {
- CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows 64-bit/sdk"
-}
-
-exists ($$CDB_PATH) {
message("Adding support for $$CDB_PATH")
DEFINES+=CDB_ENABLED
@@ -70,6 +64,6 @@ FORMS += $$PWD/cdboptionspagewidget.ui
} else {
message("Debugging Tools for Windows could not be found in $$CDB_PATH")
-}
-}
-}
+} # exists($$CDB_PATH)
+} # (QMAKE_CXX, cl)
+} # win32
--
GitLab