Merge branch 'master' of https://github.com/ea4k/klog

Author: ea4k

.github/workflows/c-cpp.yml

@@ -8,21 +8,27 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v3
-    - name: Install dependencies
-      run: |
-        sudo apt-get update
-        sudo apt install -y --fix-missing make qmake6 qt6-base-dev qt6-declarative-dev libhamlib-dev build-essential libgl1-mesa-dev libqt6serialport6-dev qt6-positioning-dev libqt6charts6-dev qt6-l10n-tools
-    - name: Move to sources folder
-      run: |
-       cd src
-       ls
-       qmake6 src.pro
-    - name: make
-      run: |
-        cd src
-        make
+      - uses: actions/checkout@v3
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --fix-missing \
+            build-essential cmake ninja-build \
+            qt6-base-dev qt6-base-dev-tools \
+            qt6-declarative-dev \
+            libqt6serialport6-dev \
+            qt6-positioning-dev \
+            libqt6charts6-dev \
+            libhamlib-dev \
+            libgl1-mesa-dev
+
+      - name: Configure (CMake)
+        run: |
+          cmake -S . -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release
+
+      - name: Build (CMake)
+        run: |
+          cmake --build build --parallel

appveyor.yml

@@ -5,8 +5,7 @@ image:
 
 install:
   - sh: sudo apt-get -qq update
-  - sh: sudo apt install -qqy make qmake6 qt6-base-dev qt6-declarative-dev libhamlib-dev build-essential libgl1-mesa-dev libqt6serialport6-dev qt6-positioning-dev libqt6charts6-dev qt6-l10n-tools
+  - sh: sudo apt install -qqy make cmake qt6-base-dev qt6-declarative-dev libhamlib-dev build-essential libgl1-mesa-dev libqt6serialport6-dev qt6-positioning-dev qml6-module-qtlocation libqt6charts6-dev qt6-l10n-tools
 build_script:
-  - cd src
-  - qmake6 src.pro
+  - cmake .
   - make

cmake/FindHamlib.cmake

@@ -7,7 +7,7 @@ set(_hamlib_hints
   $ENV{HAMLIB_ROOT}
   ${HAMLIB_ROOT}
   ${Hamlib_ROOT}
-  "C:/deps/hamlib"
+  "C:/Users/devel/Documents/GitHub/libs/win64/hamlib"
   "/usr"
   "/usr/local"
   "/opt/homebrew"