From ae9a5b0920cb52df6a8ecdbe337c7639e153c27f Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Tue, 21 Nov 2023 10:11:18 +0100 Subject: [PATCH] Revert "Project: remove DESTFILE definition (disrupts yocto build)" This reverts commit 3cdd11cc3682f61592c4ea466cfa293e32ad1c4c. --- CArunGUI/CArunGUI.pro | 2 ++ DCLibraries.pri | 1 + dCArun/dCArun.pro | 2 ++ lib_ca_master/lib_ca_master.pro | 1 + lib_ca_slave/lib_ca_slave.pro | 1 + 5 files changed, 7 insertions(+) diff --git a/CArunGUI/CArunGUI.pro b/CArunGUI/CArunGUI.pro index fe56adf..1e34ec4 100644 --- a/CArunGUI/CArunGUI.pro +++ b/CArunGUI/CArunGUI.pro @@ -8,6 +8,8 @@ TEMPLATE = app VERSION = "1.0.0" +DESTDIR=$${_PRO_FILE_PWD_}/../build + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets CONFIG += c++11 diff --git a/DCLibraries.pri b/DCLibraries.pri index 3a14e96..4425093 100644 --- a/DCLibraries.pri +++ b/DCLibraries.pri @@ -18,6 +18,7 @@ EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}" INCLUDEPATH += $${PWD}/include DEPENDPATH += $${PWD} +DESTDIR=$${_PRO_FILE_PWD_}/build CONFIG += c++11 diff --git a/dCArun/dCArun.pro b/dCArun/dCArun.pro index 6799bae..82bfba6 100644 --- a/dCArun/dCArun.pro +++ b/dCArun/dCArun.pro @@ -8,6 +8,8 @@ TEMPLATE = app VERSION = "1.0.0" +DESTDIR=$${_PRO_FILE_PWD_}/../build + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets diff --git a/lib_ca_master/lib_ca_master.pro b/lib_ca_master/lib_ca_master.pro index 26110c6..f694294 100644 --- a/lib_ca_master/lib_ca_master.pro +++ b/lib_ca_master/lib_ca_master.pro @@ -5,6 +5,7 @@ VERSION="1.0.0" include(../DCLibraries.pri) DEFINES+=THIS_IS_CA_MASTER +DESTDIR=$${_PRO_FILE_PWD_}/../build unix { system("mkdir -p $${DESTDIR}") diff --git a/lib_ca_slave/lib_ca_slave.pro b/lib_ca_slave/lib_ca_slave.pro index 74cf674..0acb9e4 100644 --- a/lib_ca_slave/lib_ca_slave.pro +++ b/lib_ca_slave/lib_ca_slave.pro @@ -5,6 +5,7 @@ VERSION="1.0.0" include(../DCLibraries.pri) DEFINES+=THIS_IS_CA_SLAVE +DESTDIR=$${_PRO_FILE_PWD_}/../build unix { system("mkdir -p $${DESTDIR}")