Use the same QsLog for trikRuntime and trik-studio when building trik-studio

Author: MinyazevR

.github/workflows/common_build.yml

@@ -73,7 +73,7 @@ jobs:
       os: macos-14
       build: true
       build_installer: true
-      qmake_extra: " CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off"
+      qmake_extra: "CONFIG+=use_same_qslog CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off"
       trik_python3_version_minor: 11
       tests: true
     secrets: inherit
@@ -160,7 +160,7 @@ jobs:
       build: true
       build_installer: true
       tests: true
-      qmake_extra: "CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=warn_off"
+      qmake_extra: "CONFIG+=use_same_qslog CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=warn_off"
       gcc_version: 13
       trik_qt_version: 5.15
       trik_python3_version_minor: 11

.github/workflows/windows_build_with_installer.yml

@@ -133,7 +133,7 @@ jobs:
         timeout-minutes: 1
         run: |
             cd ${{ env.BUILD_DIR }}
-            qmake $GITHUB_WORKSPACE/studio.pro -spec win32-g++ CONFIG+=release CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=tests CONFIG+=noPch PYTHON_PATH="${pythonLocation}" PYTHON_VERSION=${{matrix.python-version}}
+            qmake $GITHUB_WORKSPACE/studio.pro -spec win32-g++ CONFIG+=use_same_qslog CONFIG+=release CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=tests CONFIG+=noPch PYTHON_PATH="${pythonLocation}" PYTHON_VERSION=${{matrix.python-version}}
 
       - name: QMake all
         timeout-minutes: 5

global.pri

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 !isEmpty(_PRO_FILE_):!isEmpty(CONFIG):isEmpty(GLOBAL_PRI_INCLUDED){
-#GLOBAL_PRI_INCLUDED = $$PWD
+GLOBAL_PRI_INCLUDED = $$PWD
 
 CONFIG *= qt thread exceptions
 

plugins/robots/thirdparty/trikRuntime/trikRuntime

@@ -29,6 +29,16 @@ SUBDIRS += \
 	mlx90640-library \
 #	translations \
 
+CONFIG(use_same_qslog) {
+    trikRuntimeQsLog.file = $$GLOBAL_PRI_INCLUDED/thirdparty/qslog/qslog/QsLogSharedLibrary.pro
+    EXTERNAL_SETTINGS = $$PWD/trikRuntimeExternal.pri
+    cache(EXTERNAL_SETTINGS, set stash super)
+} else {
+    trikRuntimeQsLog.file = $$PWD/trikRuntime/qslog/QsLogSharedLibrary.pro
+    EXTERNAL_SETTINGS =
+    cache(EXTERNAL_SETTINGS, set stash super)
+}
+
 tests {
 	SUBDIRS *= tests
 	tests.depends = trikScriptRunner trikCommunicator trikKernel trikRuntimeQsLog
@@ -40,21 +50,19 @@ tests {
     trikScriptRunner.depends += PythonQt
     PythonQt.subdir = $$PWD/trikRuntime/PythonQt
 }
-trikRuntimeQsLog.file = $$PWD/trikRuntime/qslog/QsLogSharedLibrary.pro
 trikScriptRunner.subdir = $$PWD/trikRuntime/trikScriptRunner
 trikCommunicator.subdir = $$PWD/trikRuntime/trikCommunicator
 trikKernel.subdir = $$PWD/trikRuntime/trikKernel
 trikNetwork.subdir = $$PWD/trikRuntime/trikNetwork
 trikControl.subdir = $$PWD/trikRuntime/trikControl
 translations.subdir = $$PWD/trikRuntime/translations
 trikHal.subdir = $$PWD/trikRuntime/trikHal
-trikRuntimeQsLog.file = $$PWD/trikRuntime/qslog/QsLogSharedLibrary.pro
 mlx90640-library.subdir = $$PWD/trikRuntime/mlx90640-library
+
 trikControl.depends = trikKernel trikHal mlx90640-library
 trikKernel.depends = trikRuntimeQsLog
 trikNetwork.depends = trikKernel
 trikScriptRunner.depends += trikControl trikKernel trikNetwork
 trikHal.depends = trikKernel
 trikCommunicator.depends = trikScriptRunner
-
 OTHER_FILES += trikRuntime/trikRuntime.pro

plugins/robots/thirdparty/trikRuntime/trikRuntime.pro

@@ -0,0 +1,14 @@
+defineTest(links) {
+    LIBS *= -L$$GLOBAL_DESTDIR
+    LIBS *= -L$$DESTDIR
+    PROJECTS = $$1
+
+    for(PROJECT, PROJECTS) {
+        contains(PROJECT, .*QsLog.*) {
+            LIBS += -ltrikQsLog$$CONFIGURATION_SUFFIX
+        } else {
+	        LIBS += -l$$PROJECT$$CONFIGURATION_SUFFIX
+	    }
+    }
+    export(LIBS)
+}