diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-07-24 10:57:19 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-24 10:05:01 +0000 |
| commit | b24c37c89f7db5363f4860ba269dba482b19a5f1 (patch) | |
| tree | f52997d4ef5b75e07825f1b60e06db8dcb5aeb77 | |
| parent | e0cadaac20554dc5b553db217d6f9ca17c6bb430 (diff) | |
| download | qbs-b24c37c89f7db5363f4860ba269dba482b19a5f1.tar.gz | |
fix FreeBSD build
Task-number: QBS-828
Change-Id: I70f309b96d6756f0d6dd5f3ba5cf7dd29808a67d
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| -rw-r--r-- | src/lib/corelib/corelib.pro | 1 | ||||
| -rw-r--r-- | src/lib/corelib/corelib.qbs | 12 | ||||
| -rw-r--r-- | src/lib/corelib/tools/processutils.cpp | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/lib/corelib/corelib.pro b/src/lib/corelib/corelib.pro index 0ca2b1d19..1c3213c5e 100644 --- a/src/lib/corelib/corelib.pro +++ b/src/lib/corelib/corelib.pro @@ -22,6 +22,7 @@ include(parser/parser.pri) include(tools/tools.pri) win32:LIBS += -lpsapi +freebsd:LIBS += -lutil HEADERS += \ qbs.h diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index 8ab3ca7b2..d0b42354b 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -18,8 +18,16 @@ QbsLibrary { "QT_CREATOR", "QML_BUILD_STATIC_LIB", // needed for QmlJS "SRCDIR=\"" + path + "\"" ]).concat(projectFileUpdateDefines) - cpp.dynamicLibraries: base.concat(qbs.targetOS.contains("windows") - ? ["Psapi"] : []) + + Properties { + condition: qbs.targetOS.contains("windows") + cpp.dynamicLibraries: base.concat(["Psapi"]) + } + Properties { + condition: qbs.targetOS.contains("freebsd") + cpp.dynamicLibraries: base.concat(["util"]) + } + cpp.dynamicLibraries: base Properties { condition: qbs.targetOS.contains("darwin") diff --git a/src/lib/corelib/tools/processutils.cpp b/src/lib/corelib/tools/processutils.cpp index 11da36269..e02f44528 100644 --- a/src/lib/corelib/tools/processutils.cpp +++ b/src/lib/corelib/tools/processutils.cpp @@ -41,6 +41,8 @@ # include <unistd.h> # include <cstdio> #elif defined(Q_OS_BSD4) +# include <libutil.h> +# include <sys/types.h> # include <sys/user.h> #else # error Missing implementation of processNameByPid for this platform. |