From 925c3d621029ea7b344bfe4fb139a58b3d2066cf Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Thu, 7 Dec 2017 01:25:26 +0100 Subject: [PATCH] Limit crashpad's INCLUDEPATH to blackcore Summary: Only blackcore includes the headers of crashpad. It is therefore not necessary to add this include paths globally for all projects. Reviewers: #swift_pilot_client, kbasan Reviewed By: #swift_pilot_client, kbasan Subscribers: jenkins Differential Revision: https://dev.swift-project.org/D70 --- mkspecs/features/externals.pri | 2 -- src/blackcore/blackcore.pro | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/externals.pri b/mkspecs/features/externals.pri index cb6f19617..b45c78367 100644 --- a/mkspecs/features/externals.pri +++ b/mkspecs/features/externals.pri @@ -37,8 +37,6 @@ msvc { INCLUDEPATH *= $$EXTERNALSROOT/common/include INCLUDEPATH *= $$EXTERNALSROOT/$$EXTERNALS_SPEC/include -INCLUDEPATH *= $$EXTERNALSROOT/common/include/crashpad -INCLUDEPATH *= $$EXTERNALSROOT/common/include/mini_chromium equals(WORD_SIZE,64) { EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/bin64 diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro index 7f9a1d3a5..a4d62b522 100644 --- a/src/blackcore/blackcore.pro +++ b/src/blackcore/blackcore.pro @@ -19,6 +19,9 @@ PRECOMPILED_HEADER = pch/pch.h DEFINES += LOG_IN_FILE BUILD_BLACKCORE_LIB +INCLUDEPATH *= $$EXTERNALSROOT/common/include/crashpad +INCLUDEPATH *= $$EXTERNALSROOT/common/include/mini_chromium + HEADERS += *.h HEADERS += $$PWD/application/*.h HEADERS += $$PWD/audio/*.h