Add missing PRE_TARGETDEPS in simulator plugin projects

Summary:
This fixes issue reported by Klaus in Slack:
> when I change something in the plugin driver, I always have to rebuild the plugins before I can debug again.

Also refactored `libraries.pri` to remove duplication.

Reviewers: #swift_pilot_client, rwinklmeier

Reviewed By: #swift_pilot_client, rwinklmeier

Subscribers: kbasan, jenkins

Tags: #swift_pilot_client

Differential Revision: https://dev.swift-project.org/D31
This commit is contained in:
Mathew Sutcliffe
2017-06-30 18:31:26 +01:00
parent 574d4056ce
commit 1400f38aa9
7 changed files with 38 additions and 41 deletions

View File

@@ -194,6 +194,27 @@ isEmpty(PREFIX) {
win32: CONFIG(debug, debug|release): DLL_DEBUG_SUFFIX = d
################################
# Inter-project dependencies
################################
defineTest(addStaticLibraryDependency) {
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/$${1}.lib
else: PRE_TARGETDEPS += $$DestRoot/lib/lib$${1}.a
export(PRE_TARGETDEPS)
}
defineTest(addLibraryDependency) {
contains(BLACK_CONFIG, Static) {
addStaticLibraryDependency($$1)
}
else {
win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/$${1}.lib
win32-g++*: PRE_TARGETDEPS += $$DestRoot/lib/lib$${1}.a
linux-g++*: PRE_TARGETDEPS += $$DestRoot/lib/lib$${1}.so
macx-clang: PRE_TARGETDEPS += $$DestRoot/lib/lib$${1}.dylib
export(PRE_TARGETDEPS)
}
}
################################
# Experimental support for Clang on Windows
################################