diff --git a/.gitignore b/.gitignore index 8a8565f..7191cc6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /.vs /build_d /html/.idea +/out diff --git a/CMakeSettings.json b/CMakeSettings.json index c27b4f5..8f1646d 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -4,9 +4,7 @@ "name": "x64-Debug", "generator": "Ninja", "configurationType": "Debug", - "inheritEnvironments": [ - "msvc_x64_x64" - ], + "inheritEnvironments": [ "msvc_x64_x64" ], "buildRoot": "${workspaceRoot}/build_d", "installRoot": "${workspaceRoot}/build_d", "cmakeCommandArgs": "", @@ -17,14 +15,32 @@ "name": "x64-Release", "generator": "Ninja", "configurationType": "Release", - "inheritEnvironments": [ - "msvc_x64_x64" - ], + "inheritEnvironments": [ "msvc_x64_x64" ], "buildRoot": "${workspaceRoot}/build_r", "installRoot": "${workspaceRoot}/build_r", "cmakeCommandArgs": "", "buildCommandArgs": "-v", "ctestCommandArgs": "" + }, + { + "name": "Linux-GCC-Debug", + "generator": "Unix Makefiles", + "configurationType": "Debug", + "cmakeExecutable": "/opt/cmake/bin/cmake", + "remoteCopySourcesExclusionList": [ ".vs", ".git", "out" ], + "cmakeCommandArgs": "-- -j4", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "linux_arm" ], + "intelliSenseMode": "linux-gcc-x64", + "remoteMachineName": "948173717;172.16.0.232 (username=root, port=22, authentication=Password)", + "remoteCMakeListsRoot": "/home/pi/SIF0/src", + "remoteBuildRoot": "/home/pi/SIF0/out/build_d/${name}", + "remoteInstallRoot": "/home/pi/SIF0/out/install/${name}", + "remoteCopySources": true, + "rsyncCommandArgs": "-t --delete --delete-excluded", + "remoteCopyBuildOutput": true, + "remoteCopySourcesMethod": "rsync" } ] } \ No newline at end of file diff --git a/CmakeLists.txt b/CmakeLists.txt index 3f5e8d5..59724b8 100644 --- a/CmakeLists.txt +++ b/CmakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) set(QT Core Network WebSockets SerialPort Widgets) - +set(CMAKE_CXX_STANDARD 14) find_package(Qt5 REQUIRED ${QT})