Revert "Project: remove DESTFILE definition (disrupts yocto build)"

This reverts commit 3cdd11cc36.
Project: remove DESTFILE definition (disrupts yocto build)
2023-11-21 10:11:18 +01:00 · 2023-11-21 10:06:00 +01:00 · 2023-11-21 09:25:04 +01:00 · 2023-11-20 17:01:02 +01:00 · 2023-11-20 11:32:45 +01:00 · 2023-11-15 10:17:45 +01:00
6 changed files with 9 additions and 17 deletions
--- 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
@@ -50,7 +52,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
--- a/CArunGUI/mainwindow.cpp
+++ b/CArunGUI/mainwindow.cpp
@@ -9,7 +9,8 @@ char MainWindow::loadPlugIn(char lade1_entlade2)
    //pluginLoader->setFileName("../MasterPlug/libCAmaster.so");   // for suse
    //pluginLoader->setFileName("../SlavePlug/libCAslave.so");  // for ptu5
    //pluginLoader->setFileName("../../MasterPlug/CAmaster.dll"); // for windows
-    pluginLoader->setFileName("CAmaster.dll"); // for windows
+    //pluginLoader->setFileName("CAmaster.dll"); // for windows
+    pluginLoader->setFileName("/usr/lib/libCAmaster.so"); // for ptu5

    if (lade1_entlade2==2)
    {
--- 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
--- a/config/comport.csv
+++ b/config/comport.csv
@@ -0,0 +1 @@
+s,5,115200,ttymxc2,2,
--- 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
@@ -53,8 +55,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
--- a/dCArun/mainwindow.cpp
+++ b/dCArun/mainwindow.cpp
@@ -9,7 +9,8 @@ char MainWindow::loadPlugIn(char lade1_entlade2)
    //pluginLoader->setFileName("../MasterPlug/libCAmaster.so");   // for suse
    //pluginLoader->setFileName("../SlavePlug/libCAslave.so");  // for ptu5
    //pluginLoader->setFileName("../../MasterPlug/CAmaster.dll"); // for windows
-    pluginLoader->setFileName("CAmaster.dll"); // for windows
+    //pluginLoader->setFileName("CAmaster.dll"); // for windows
+    pluginLoader->setFileName("/usr/lib/libCAmaster.so"); // for ptu5

    if (lade1_entlade2==2)
    {
Author	SHA1	Message	Date
Siegfried Siegert	ae9a5b0920	Revert "Project: remove DESTFILE definition (disrupts yocto build)" This reverts commit `3cdd11cc36`.	2023-11-21 10:11:18 +01:00
Siegfried Siegert	3cdd11cc36	Project: remove DESTFILE definition (disrupts yocto build)	2023-11-21 10:06:00 +01:00
Siegfried Siegert	7746f22d01	Project: set TEMPLATE for apps	2023-11-21 09:25:04 +01:00
Siegfried Siegert	27f1a47e23	Project: remove rules for deployment	2023-11-20 17:01:02 +01:00
Gerhard Hoffmann	eed4c278f8	csv loaded by dCArun: contains standard settings for serial connection	2023-11-20 11:32:45 +01:00
Gerhard Hoffmann	1dd368dad3	Use /usr/lib as path for the CA-libraries on the PTU5.	2023-11-15 10:17:45 +01:00