From 5049ece263be0f341ea78bfee663100f3166ad5d Mon Sep 17 00:00:00 2001 From: mgrova Date: Thu, 25 May 2023 13:08:27 +0300 Subject: [PATCH] added clang-format file and renamed svg folder --- .clang-format | 43 +++ README.md | 21 ++ data/CMakeLists.txt | 4 +- data/{Svg => svg}/pfd/pfd.svg | 0 data/{Svg => svg}/pfd/pfd_adi_back.svg | 0 data/{Svg => svg}/pfd/pfd_adi_barh.svg | 0 data/{Svg => svg}/pfd/pfd_adi_barv.svg | 0 data/{Svg => svg}/pfd/pfd_adi_doth.svg | 0 data/{Svg => svg}/pfd/pfd_adi_dotv.svg | 0 data/{Svg => svg}/pfd/pfd_adi_ladd.svg | 0 data/{Svg => svg}/pfd/pfd_adi_mark.svg | 0 data/{Svg => svg}/pfd/pfd_adi_mask.svg | 0 data/{Svg => svg}/pfd/pfd_adi_path.svg | 0 data/{Svg => svg}/pfd/pfd_adi_roll.svg | 0 data/{Svg => svg}/pfd/pfd_adi_slip.svg | 0 data/{Svg => svg}/pfd/pfd_adi_turn.svg | 0 data/{Svg => svg}/pfd/pfd_alt_back.svg | 0 data/{Svg => svg}/pfd/pfd_alt_frame.svg | 0 data/{Svg => svg}/pfd/pfd_alt_ground.svg | 0 data/{Svg => svg}/pfd/pfd_alt_scale.svg | 0 data/{Svg => svg}/pfd/pfd_asi_back.svg | 0 data/{Svg => svg}/pfd/pfd_asi_frame.svg | 0 data/{Svg => svg}/pfd/pfd_asi_scale.svg | 0 data/{Svg => svg}/pfd/pfd_back.svg | 0 data/{Svg => svg}/pfd/pfd_hsi_back.svg | 0 data/{Svg => svg}/pfd/pfd_hsi_face.svg | 0 data/{Svg => svg}/pfd/pfd_hsi_marks.svg | 0 data/{Svg => svg}/pfd/pfd_mask.svg | 0 data/valgrind.supp | 320 ----------------------- src/gui/MainWindowUi.cpp | 2 +- src/images.qrc | 48 ++-- utils/CMakeLists.txt | 2 +- 32 files changed, 93 insertions(+), 347 deletions(-) create mode 100644 .clang-format rename data/{Svg => svg}/pfd/pfd.svg (100%) rename data/{Svg => svg}/pfd/pfd_adi_back.svg (100%) rename data/{Svg => svg}/pfd/pfd_adi_barh.svg (100%) rename data/{Svg => svg}/pfd/pfd_adi_barv.svg (100%) rename data/{Svg => svg}/pfd/pfd_adi_doth.svg (100%) rename data/{Svg => svg}/pfd/pfd_adi_dotv.svg (100%) rename data/{Svg => svg}/pfd/pfd_adi_ladd.svg (100%) rename data/{Svg => svg}/pfd/pfd_adi_mark.svg (100%) rename data/{Svg => svg}/pfd/pfd_adi_mask.svg (100%) rename data/{Svg => svg}/pfd/pfd_adi_path.svg (100%) rename data/{Svg => svg}/pfd/pfd_adi_roll.svg (100%) rename data/{Svg => svg}/pfd/pfd_adi_slip.svg (100%) rename data/{Svg => svg}/pfd/pfd_adi_turn.svg (100%) rename data/{Svg => svg}/pfd/pfd_alt_back.svg (100%) rename data/{Svg => svg}/pfd/pfd_alt_frame.svg (100%) rename data/{Svg => svg}/pfd/pfd_alt_ground.svg (100%) rename data/{Svg => svg}/pfd/pfd_alt_scale.svg (100%) rename data/{Svg => svg}/pfd/pfd_asi_back.svg (100%) rename data/{Svg => svg}/pfd/pfd_asi_frame.svg (100%) rename data/{Svg => svg}/pfd/pfd_asi_scale.svg (100%) rename data/{Svg => svg}/pfd/pfd_back.svg (100%) rename data/{Svg => svg}/pfd/pfd_hsi_back.svg (100%) rename data/{Svg => svg}/pfd/pfd_hsi_face.svg (100%) rename data/{Svg => svg}/pfd/pfd_hsi_marks.svg (100%) rename data/{Svg => svg}/pfd/pfd_mask.svg (100%) delete mode 100644 data/valgrind.supp diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..97fd206 --- /dev/null +++ b/.clang-format @@ -0,0 +1,43 @@ +--- +BasedOnStyle: Google +AccessModifierOffset: -2 +AlignAfterOpenBracket: AlwaysBreak +AlignArrayOfStructures: Right +AlignConsecutiveAssignments: + Enabled: true + AcrossComments: true + AlignCompound: true +AlignConsecutiveBitFields: + Enabled: true + AcrossComments: true + AlignCompound: true + PadOperators: true +AlignConsecutiveDeclarations: + Enabled: true + AcrossComments: true + AlignCompound: true + PadOperators: true +AlignConsecutiveMacros: + Enabled: true + AcrossComments: true +AlignOperands: AlignAfterOperator +AllowShortFunctionsOnASingleLine: Inline +BinPackArguments: false +BinPackParameters: false +BraceWrapping: + AfterClass: true + AfterFunction: true + SplitEmptyFunction: false +BreakBeforeBinaryOperators: All +BreakBeforeBraces: Custom +BreakConstructorInitializers: AfterColon +BreakInheritanceList: AfterColon +ColumnLimit: 120 +ConstructorInitializerIndentWidth: 8 +ContinuationIndentWidth: 8 +DerivePointerAlignment: false +EmptyLineBeforeAccessModifier: Always +IndentWidth: 4 +InsertBraces: true +SpacesBeforeTrailingComments: 1 +TabWidth: 4 \ No newline at end of file diff --git a/README.md b/README.md index 495946a..c140a49 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,27 @@ Clone [QsLog](https://github.com/fada-catec/qslog) on your third-party dependenc Follow up your ROS distro installation guide: [Melodic](http://wiki.ros.org/melodic/Installation/Ubuntu) or [Noetic](http://wiki.ros.org/noetic/Installation/Ubuntu) +### (Optional) Clang-Format 16 + +``` +sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal main' +sudo apt update +sudo apt install clang-format-16 +``` + +* **Troubleshooting installing clang-format** + +If you end up with a missing key error like this one: +```bash +Err:1 https://apt.llvm.org/focal llvm-toolchain-focal InRelease +The following signatures couldn't be verified because the public key is not available: NO_PUBKEY 15CF4D18AF4F7421 +``` + +You can solve it by adding that necessary key: +```bash +sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 15CF4D18AF4F7421 +sudo apt update +``` ### PILOTING MAVSDK On your third-party dependencies folder: diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index b4aaf60..9060a2f 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -3,6 +3,8 @@ FILE(GLOB_RECURSE DATA_IMAGES "*.png" "*.jpg" "*.svg") INSTALL(FILES ${DATA_IMAGES} DESTINATION share/${PROJECT_NAME}) - INSTALL(DIRECTORY meshes DESTINATION share/${PROJECT_NAME}) + +INSTALL(DIRECTORY svg + DESTINATION share/${PROJECT_NAME}) diff --git a/data/Svg/pfd/pfd.svg b/data/svg/pfd/pfd.svg similarity index 100% rename from data/Svg/pfd/pfd.svg rename to data/svg/pfd/pfd.svg diff --git a/data/Svg/pfd/pfd_adi_back.svg b/data/svg/pfd/pfd_adi_back.svg similarity index 100% rename from data/Svg/pfd/pfd_adi_back.svg rename to data/svg/pfd/pfd_adi_back.svg diff --git a/data/Svg/pfd/pfd_adi_barh.svg b/data/svg/pfd/pfd_adi_barh.svg similarity index 100% rename from data/Svg/pfd/pfd_adi_barh.svg rename to data/svg/pfd/pfd_adi_barh.svg diff --git a/data/Svg/pfd/pfd_adi_barv.svg b/data/svg/pfd/pfd_adi_barv.svg similarity index 100% rename from data/Svg/pfd/pfd_adi_barv.svg rename to data/svg/pfd/pfd_adi_barv.svg diff --git a/data/Svg/pfd/pfd_adi_doth.svg b/data/svg/pfd/pfd_adi_doth.svg similarity index 100% rename from data/Svg/pfd/pfd_adi_doth.svg rename to data/svg/pfd/pfd_adi_doth.svg diff --git a/data/Svg/pfd/pfd_adi_dotv.svg b/data/svg/pfd/pfd_adi_dotv.svg similarity index 100% rename from data/Svg/pfd/pfd_adi_dotv.svg rename to data/svg/pfd/pfd_adi_dotv.svg diff --git a/data/Svg/pfd/pfd_adi_ladd.svg b/data/svg/pfd/pfd_adi_ladd.svg similarity index 100% rename from data/Svg/pfd/pfd_adi_ladd.svg rename to data/svg/pfd/pfd_adi_ladd.svg diff --git a/data/Svg/pfd/pfd_adi_mark.svg b/data/svg/pfd/pfd_adi_mark.svg similarity index 100% rename from data/Svg/pfd/pfd_adi_mark.svg rename to data/svg/pfd/pfd_adi_mark.svg diff --git a/data/Svg/pfd/pfd_adi_mask.svg b/data/svg/pfd/pfd_adi_mask.svg similarity index 100% rename from data/Svg/pfd/pfd_adi_mask.svg rename to data/svg/pfd/pfd_adi_mask.svg diff --git a/data/Svg/pfd/pfd_adi_path.svg b/data/svg/pfd/pfd_adi_path.svg similarity index 100% rename from data/Svg/pfd/pfd_adi_path.svg rename to data/svg/pfd/pfd_adi_path.svg diff --git a/data/Svg/pfd/pfd_adi_roll.svg b/data/svg/pfd/pfd_adi_roll.svg similarity index 100% rename from data/Svg/pfd/pfd_adi_roll.svg rename to data/svg/pfd/pfd_adi_roll.svg diff --git a/data/Svg/pfd/pfd_adi_slip.svg b/data/svg/pfd/pfd_adi_slip.svg similarity index 100% rename from data/Svg/pfd/pfd_adi_slip.svg rename to data/svg/pfd/pfd_adi_slip.svg diff --git a/data/Svg/pfd/pfd_adi_turn.svg b/data/svg/pfd/pfd_adi_turn.svg similarity index 100% rename from data/Svg/pfd/pfd_adi_turn.svg rename to data/svg/pfd/pfd_adi_turn.svg diff --git a/data/Svg/pfd/pfd_alt_back.svg b/data/svg/pfd/pfd_alt_back.svg similarity index 100% rename from data/Svg/pfd/pfd_alt_back.svg rename to data/svg/pfd/pfd_alt_back.svg diff --git a/data/Svg/pfd/pfd_alt_frame.svg b/data/svg/pfd/pfd_alt_frame.svg similarity index 100% rename from data/Svg/pfd/pfd_alt_frame.svg rename to data/svg/pfd/pfd_alt_frame.svg diff --git a/data/Svg/pfd/pfd_alt_ground.svg b/data/svg/pfd/pfd_alt_ground.svg similarity index 100% rename from data/Svg/pfd/pfd_alt_ground.svg rename to data/svg/pfd/pfd_alt_ground.svg diff --git a/data/Svg/pfd/pfd_alt_scale.svg b/data/svg/pfd/pfd_alt_scale.svg similarity index 100% rename from data/Svg/pfd/pfd_alt_scale.svg rename to data/svg/pfd/pfd_alt_scale.svg diff --git a/data/Svg/pfd/pfd_asi_back.svg b/data/svg/pfd/pfd_asi_back.svg similarity index 100% rename from data/Svg/pfd/pfd_asi_back.svg rename to data/svg/pfd/pfd_asi_back.svg diff --git a/data/Svg/pfd/pfd_asi_frame.svg b/data/svg/pfd/pfd_asi_frame.svg similarity index 100% rename from data/Svg/pfd/pfd_asi_frame.svg rename to data/svg/pfd/pfd_asi_frame.svg diff --git a/data/Svg/pfd/pfd_asi_scale.svg b/data/svg/pfd/pfd_asi_scale.svg similarity index 100% rename from data/Svg/pfd/pfd_asi_scale.svg rename to data/svg/pfd/pfd_asi_scale.svg diff --git a/data/Svg/pfd/pfd_back.svg b/data/svg/pfd/pfd_back.svg similarity index 100% rename from data/Svg/pfd/pfd_back.svg rename to data/svg/pfd/pfd_back.svg diff --git a/data/Svg/pfd/pfd_hsi_back.svg b/data/svg/pfd/pfd_hsi_back.svg similarity index 100% rename from data/Svg/pfd/pfd_hsi_back.svg rename to data/svg/pfd/pfd_hsi_back.svg diff --git a/data/Svg/pfd/pfd_hsi_face.svg b/data/svg/pfd/pfd_hsi_face.svg similarity index 100% rename from data/Svg/pfd/pfd_hsi_face.svg rename to data/svg/pfd/pfd_hsi_face.svg diff --git a/data/Svg/pfd/pfd_hsi_marks.svg b/data/svg/pfd/pfd_hsi_marks.svg similarity index 100% rename from data/Svg/pfd/pfd_hsi_marks.svg rename to data/svg/pfd/pfd_hsi_marks.svg diff --git a/data/Svg/pfd/pfd_mask.svg b/data/svg/pfd/pfd_mask.svg similarity index 100% rename from data/Svg/pfd/pfd_mask.svg rename to data/svg/pfd/pfd_mask.svg diff --git a/data/valgrind.supp b/data/valgrind.supp deleted file mode 100644 index c742b84..0000000 --- a/data/valgrind.supp +++ /dev/null @@ -1,320 +0,0 @@ -#Suppresion added for GCS proyect -{ - libfontconfigAddr4LoadConfig - Memcheck:Addr4 - ... - obj:/usr/lib/x86_64-linux-gnu/libfontconfig.so.1.4.4 - ... - fun:FcInitLoadConfig - ... -} - -{ - libfontconfigAddr4ConfigParseAndLoad - Memcheck:Addr4 - ... - obj:/usr/lib/x86_64-linux-gnu/libfontconfig.so.1.4.4 - ... - fun:FcConfigParseAndLoad - ... -} - -{ - QtNetworkSocketSend - Memcheck:Param - socketcall.sendto(msg) - ... - obj:*libQt5Network.so.* - ... -} - -{ - libglibMallocLeak - Memcheck:Leak - ... - fun:malloc - ... - obj:/lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.4 - ... - obj:*libQt5Core.so.* - ... -} - -{ - Qt5CoreLibglibc_g_main_context_push_thread - Memcheck:Leak - fun:malloc - ... - obj:/lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.4 - ... - fun:g_main_context_push_thread_default - ... - obj:*libQt5Core.so.* - ... -} - -{ - Qt5CoreLibglibc_g_main_context_push_thread2 - Memcheck:Leak - ... - fun:malloc - ... - obj:/lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.4 - ... - fun:g_main_context_push_thread_default - ... - obj:*libQt5Core.so.* - ... -} - -{ - Yeah5 - Memcheck:Leak - ... - fun:malloc - ... - obj:/lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.4 - ... - fun:g_private_get - ... -} - -{ - stdDup - Memcheck:Leak - ... - fun:strdup - ... -} - -{ - libcrypto - Memcheck:Leak - ... - obj:*libcrypto.so* - ... -} - -{ - QtNetworkConfigManager - Memcheck:Leak - fun:malloc - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - fun:_ZN35QNetworkConfigurationManagerPrivate20updateConfigurationsEv - fun:_ZN35QNetworkConfigurationManagerPrivate10initializeEv - fun:_Z35qNetworkConfigurationManagerPrivatev - fun:_ZN28QNetworkConfigurationManagerC1EP7QObject -} - -{ - QtNetworkConfigManagerCalloc - Memcheck:Leak - fun:calloc - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - fun:_ZN35QNetworkConfigurationManagerPrivate20updateConfigurationsEv - fun:_ZN35QNetworkConfigurationManagerPrivate10initializeEv -} - -{ - QtNetworkConfigManager2 - Memcheck:Leak - fun:malloc - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - fun:_ZN35QNetworkConfigurationManagerPrivate20updateConfigurationsEv - fun:_ZN35QNetworkConfigurationManagerPrivate10initializeEv -} - -{ - vgpreload - Memcheck:Leak - fun:calloc - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* -} - -{ - vgpreload - Memcheck:Leak - fun:malloc - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* - obj:* -} - -{ - FalsePositiveHttpNetworkAccess - Memcheck:Leak - ... - fun:_ZN3gcs17HttpNetworkAccess11sendRequestERK7QString - ... -} - -{ - log4cplus - Memcheck:Leak - ... - obj:/usr/lib/liblog4cplus-1.0.so.4.0.0 - ... -} - -{ - LeakMallocQappMain - Memcheck:Leak - fun:malloc - ... - fun:main - ... -} - -{ - LeakPosixMemAlign - Memcheck:Leak - ... - fun:posix_memalign - ... - obj:/lib/x86_64-linux-gnu/libglib-2.0.so.0.3200.4 - ... -} - -{ - LeakNvidia - Memcheck:Leak - ... - fun:calloc - ... - obj:/usr/lib/nvidia-331/libGL.so.* - ... -} - -{ - LeakQPlatform - Memcheck:Leak - ... - fun:_ZN15QPlatformScreenC1Ev - ... -} - -{ - LeakQtQPlatformIntegrationFactory - Memcheck:Leak - ... - fun:_ZN27QPlatformIntegrationFactory6createERK7QStringRK11QStringListRiPPcS2_ - ... -} - -{ - Cond_QEventDispatcherGlib13processEvents - Memcheck:Cond - fun:g_utf8_offset_to_pointer - obj:/usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0.2400.10 - ... - fun:_ZN20QEventDispatcherGlib13processEventsE6QFlagsIN10QEventLoop17ProcessEventsFlagEE - ... -} - -{ - Cond_g_cclosure_marshal_VOID__OBJECTv - Memcheck:Cond - ... - obj:/usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0.2400.10 - ... - fun:g_cclosure_marshal_VOID__OBJECTv - ... -} - -{ - Cond_QStyleFactory6createERK7QString - Memcheck:Cond - ... - obj:/usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0.2400.10 - ... - fun:_ZN13QStyleFactory6createERK7QString - ... -} - -{ - Cond_ZN18QRasterPaintEngine10drawPixmapERK6QRectFRK7QPixmapS2_ - Memcheck:Cond - ... - obj:*libQt5Gui.so.* - ... - fun:_ZN18QRasterPaintEngine10drawPixmapERK6QRectFRK7QPixmapS2_ - ... -} - -{ - Cond_pixman_image_composite32 - Memcheck:Cond - ... - obj:*libpixman-1.so.* - ... - fun:pixman_image_composite32 - ... -} - -{ - Cond_rsvg_handle_get_pixbuf_sub - Memcheck:Cond - ... - obj:*librsvg-2.so.* - ... - fun:rsvg_handle_get_pixbuf_sub - ... -} - -{ - Cond_ZNK17QFileIconProvider4iconERK9QFileInfo - Memcheck:Cond - ... - fun:_ZNK17QFileIconProvider4iconERK9QFileInfo - ... -} - -{ - Cond_murrine_draw_expander - Memcheck:Cond - ... - fun:murrine_draw_expander - ... - obj:*libmurrine.so* - ... -} diff --git a/src/gui/MainWindowUi.cpp b/src/gui/MainWindowUi.cpp index 3fb888f..c85e8bf 100644 --- a/src/gui/MainWindowUi.cpp +++ b/src/gui/MainWindowUi.cpp @@ -658,7 +658,7 @@ void MainWindowUi::loadMissionResultsFromFolder() void MainWindowUi::loadXMLDataFromFolder() { const auto default_path = QString::fromStdString(PROJECT_SOURCE_PATH + std::string("data/xml")); - const auto ros_path = QString::fromStdString("/opt/ros/melodic/share/piloting_grcs/xml"); + const auto ros_path = QString::fromStdString("/opt/ros/melodic/share/piloting_grcs/data/xml"); QString xml_path = QString(); if (QDir(default_path).exists()) { diff --git a/src/images.qrc b/src/images.qrc index c9e1982..2b3fafd 100644 --- a/src/images.qrc +++ b/src/images.qrc @@ -27,30 +27,30 @@ ../data/icons/eye-on.png ../data/icons/eye-off.png - ../data/Svg/pfd/pfd_adi_back.svg - ../data/Svg/pfd/pfd_adi_barh.svg - ../data/Svg/pfd/pfd_adi_barv.svg - ../data/Svg/pfd/pfd_adi_doth.svg - ../data/Svg/pfd/pfd_adi_dotv.svg - ../data/Svg/pfd/pfd_adi_ladd.svg - ../data/Svg/pfd/pfd_adi_mark.svg - ../data/Svg/pfd/pfd_adi_mask.svg - ../data/Svg/pfd/pfd_adi_path.svg - ../data/Svg/pfd/pfd_adi_roll.svg - ../data/Svg/pfd/pfd_adi_slip.svg - ../data/Svg/pfd/pfd_adi_turn.svg - ../data/Svg/pfd/pfd_alt_back.svg - ../data/Svg/pfd/pfd_alt_frame.svg - ../data/Svg/pfd/pfd_alt_ground.svg - ../data/Svg/pfd/pfd_alt_scale.svg - ../data/Svg/pfd/pfd_asi_back.svg - ../data/Svg/pfd/pfd_asi_frame.svg - ../data/Svg/pfd/pfd_asi_scale.svg - ../data/Svg/pfd/pfd_back.svg - ../data/Svg/pfd/pfd_hsi_back.svg - ../data/Svg/pfd/pfd_hsi_face.svg - ../data/Svg/pfd/pfd_hsi_marks.svg - ../data/Svg/pfd/pfd_mask.svg + ../data/svg/pfd/pfd_adi_back.svg + ../data/svg/pfd/pfd_adi_barh.svg + ../data/svg/pfd/pfd_adi_barv.svg + ../data/svg/pfd/pfd_adi_doth.svg + ../data/svg/pfd/pfd_adi_dotv.svg + ../data/svg/pfd/pfd_adi_ladd.svg + ../data/svg/pfd/pfd_adi_mark.svg + ../data/svg/pfd/pfd_adi_mask.svg + ../data/svg/pfd/pfd_adi_path.svg + ../data/svg/pfd/pfd_adi_roll.svg + ../data/svg/pfd/pfd_adi_slip.svg + ../data/svg/pfd/pfd_adi_turn.svg + ../data/svg/pfd/pfd_alt_back.svg + ../data/svg/pfd/pfd_alt_frame.svg + ../data/svg/pfd/pfd_alt_ground.svg + ../data/svg/pfd/pfd_alt_scale.svg + ../data/svg/pfd/pfd_asi_back.svg + ../data/svg/pfd/pfd_asi_frame.svg + ../data/svg/pfd/pfd_asi_scale.svg + ../data/svg/pfd/pfd_back.svg + ../data/svg/pfd/pfd_hsi_back.svg + ../data/svg/pfd/pfd_hsi_face.svg + ../data/svg/pfd/pfd_hsi_marks.svg + ../data/svg/pfd/pfd_mask.svg ../data/styles/indoor_style.qss diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 49538a4..216e393 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -19,7 +19,7 @@ IF(${BUILD_UTILS}) ${PROJECT_NAME}_gui ${PROJECT_NAME}_maps) - SET(ICON_NAME "PILOTING GRCS") + SET(ICON_NAME "PILOTING gRCS") CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/cmake_stuff/app.desktop.in" "${PROJECT_BINARY_DIR}/${APP_NAME}.desktop" @ONLY)