From 27f1a47e23cf77b44786454abe5e944b7e90a07e Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Mon, 20 Nov 2023 17:01:02 +0100 Subject: [PATCH 1/4] Project: remove rules for deployment --- CArunGUI/CArunGUI.pro | 4 ---- DCLibraries.pri | 6 ------ dCArun/dCArun.pro | 5 ----- 3 files changed, 15 deletions(-) diff --git a/CArunGUI/CArunGUI.pro b/CArunGUI/CArunGUI.pro index 22114b2..b08098f 100644 --- a/CArunGUI/CArunGUI.pro +++ b/CArunGUI/CArunGUI.pro @@ -50,7 +50,3 @@ HEADERS += \ datei.h \ plugin.h -# Default rules for deployment. -qnx: target.path = /tmp/$${TARGET}/bin -else: unix:!android: target.path = /opt/$${TARGET}/bin -!isEmpty(target.path): INSTALLS += target diff --git a/DCLibraries.pri b/DCLibraries.pri index 8b75bd1..4425093 100644 --- a/DCLibraries.pri +++ b/DCLibraries.pri @@ -126,9 +126,3 @@ SOURCES += \ # version.variable_out = HEADERS # QMAKE_EXTRA_COMPILERS += version # QMAKE_CLEAN += $${PWD}/include/version.h - - -# Default rules for deployment. -qnx: target.path = /tmp/$${TARGET}/bin -else: unix:!android: target.path = /opt/$${TARGET}/bin -!isEmpty(target.path): INSTALLS += target diff --git a/dCArun/dCArun.pro b/dCArun/dCArun.pro index 0b886f9..378a8f4 100644 --- a/dCArun/dCArun.pro +++ b/dCArun/dCArun.pro @@ -53,8 +53,3 @@ HEADERS += \ win01_com.h \ datei.h \ plugin.h - -# Default rules for deployment. -qnx: target.path = /tmp/$${TARGET}/bin -else: unix:!android: target.path = /opt/$${TARGET}/bin -!isEmpty(target.path): INSTALLS += target From 7746f22d01672a86311c6dd0f941e5623aeae52a Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Tue, 21 Nov 2023 09:25:04 +0100 Subject: [PATCH 2/4] Project: set TEMPLATE for apps --- CArunGUI/CArunGUI.pro | 2 ++ dCArun/dCArun.pro | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CArunGUI/CArunGUI.pro b/CArunGUI/CArunGUI.pro index b08098f..1e34ec4 100644 --- a/CArunGUI/CArunGUI.pro +++ b/CArunGUI/CArunGUI.pro @@ -4,6 +4,8 @@ QT +=network # for TCP-IP TARGET = CArunGui +TEMPLATE = app + VERSION = "1.0.0" DESTDIR=$${_PRO_FILE_PWD_}/../build diff --git a/dCArun/dCArun.pro b/dCArun/dCArun.pro index 378a8f4..82bfba6 100644 --- a/dCArun/dCArun.pro +++ b/dCArun/dCArun.pro @@ -4,6 +4,8 @@ QT +=network # for TCP-IP TARGET = dCArun +TEMPLATE = app + VERSION = "1.0.0" DESTDIR=$${_PRO_FILE_PWD_}/../build From 3cdd11cc3682f61592c4ea466cfa293e32ad1c4c Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Tue, 21 Nov 2023 10:06:00 +0100 Subject: [PATCH 3/4] Project: remove DESTFILE definition (disrupts yocto build) --- 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 deletions(-) diff --git a/CArunGUI/CArunGUI.pro b/CArunGUI/CArunGUI.pro index 1e34ec4..fe56adf 100644 --- a/CArunGUI/CArunGUI.pro +++ b/CArunGUI/CArunGUI.pro @@ -8,8 +8,6 @@ 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 4425093..3a14e96 100644 --- a/DCLibraries.pri +++ b/DCLibraries.pri @@ -18,7 +18,6 @@ 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 82bfba6..6799bae 100644 --- a/dCArun/dCArun.pro +++ b/dCArun/dCArun.pro @@ -8,8 +8,6 @@ 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 f694294..26110c6 100644 --- a/lib_ca_master/lib_ca_master.pro +++ b/lib_ca_master/lib_ca_master.pro @@ -5,7 +5,6 @@ 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 0acb9e4..74cf674 100644 --- a/lib_ca_slave/lib_ca_slave.pro +++ b/lib_ca_slave/lib_ca_slave.pro @@ -5,7 +5,6 @@ VERSION="1.0.0" include(../DCLibraries.pri) DEFINES+=THIS_IS_CA_SLAVE -DESTDIR=$${_PRO_FILE_PWD_}/../build unix { system("mkdir -p $${DESTDIR}") From ae9a5b0920cb52df6a8ecdbe337c7639e153c27f Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Tue, 21 Nov 2023 10:11:18 +0100 Subject: [PATCH 4/4] 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}")