Skip to content

Commit

Permalink
ttt
Browse files Browse the repository at this point in the history
  • Loading branch information
grodansparadis committed Sep 25, 2024
1 parent abe3809 commit e7d5eab
Show file tree
Hide file tree
Showing 9 changed files with 181 additions and 1,255 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/appimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,8 @@ jobs:
version: 5.15.*
host: 'linux'
target: 'desktop'
arch: 'gcc_64'
modules: qtcharts
# modules: 'qtcharts qtconnectivity qtserialbus qtserialport qtwebsockets'
arch: 'linux_amd64_gcc'
modules: 'qtcharts qtconnectivity qtserialbus qtserialport qtwebsockets'
# extra: '--exclude-libs=libqsqlmimer'

- name: Setup cmake
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
build-vscp-works-qt-Desktop_Qt_5_14_2_GCC_64bit-Debug
vscp
build
src/CMakeCache.txt
src/CMakeFiles/
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@
[submodule "third_party/qspdlog"]
path = third_party/qspdlog
url = https://github.com/arsdever/qspdlog.git
[submodule "vscp"]
path = vscp
url = https://github.com/grodansparadis/vscp.git
8 changes: 8 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,14 @@
"preLaunchTask": "g++ build active file",
"miDebuggerPath": "/usr/bin/gdb",
"visualizerFile": "/home/akhe/.config/Code/User/workspaceStorage/b3a88788bb1e8a32eb6392485a993de5/tonka3000.qtvsctools/qt.natvis.xml"
},
{
"type": "cmake",
"request": "launch",
"name": "Debug portfile(s)",
"cmakeDebugType": "external",
"pipeName": "/tmp/vcpkg_ext_portfile_dbg",
"preLaunchTask": "Debug vcpkg commands"
}
]
}
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@
"complex": "cpp",
"format": "cpp",
"codecvt": "cpp",
"charconv": "cpp"
"charconv": "cpp",
"semaphore": "cpp"
},
"python.pythonPath": "/usr/bin/python3",
"files.exclude": {
Expand Down
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/5.15.2/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug .. ; make -j4 -Wall",
"args": [],
"group": {
"kind": "build",
"kind": "build"
},
"problemMatcher": {
"owner": "cpp",
Expand Down
7 changes: 4 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@
#
# windows
# -------
# cmake .. -G "Visual Studio 17 2022" -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_TOOLCHAIN_FILE=G:\vcpkg\scripts\buildsystems\vcpkg.cmake -DCMAKE_PREFIX_PATH=G:\Qt\5.15.2\msvc2019_64\
# Set environment variabel to VSCP_ROOT
# cmake .. -G "Visual Studio 16 2019" -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_TOOLCHAIN_FILE=G:\vcpkg\scripts\buildsystems\vcpkg.cmake -DCMAKE_PREFIX_PATH=G:\Qt\6.7.2\msvc2019_64\
# cmake --build . --config Debug
# set PATH=G:\Qt\Qt-6.6.2\msvc2019_64\bin;%PATH%
# set PATH=G:\Qt\Qt-6.7.2\msvc2019_64\bin;%PATH%
#

cmake_minimum_required(VERSION 3.5)
Expand Down Expand Up @@ -88,7 +89,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)

# qt
find_package(Qt6 REQUIRED COMPONENTS Widgets Qml Core Network Sql Charts Quick SerialBus SerialPort)
find_package(Qt6 REQUIRED COMPONENTS Widgets Core Qml Network Sql Charts Quick SerialBus SerialPort)
qt_standard_project_setup()


Expand Down
1,406 changes: 160 additions & 1,246 deletions CMakeLists.txt.user

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions vscp
Submodule vscp added at 408bd5

0 comments on commit e7d5eab

Please sign in to comment.