Skip to content
Snippets Groups Projects
Commit 161854f6 authored by Alberto Nidasio's avatar Alberto Nidasio
Browse files

[CMake] Renamed target from goundstation to skywardhub

parent cf4a64ed
No related branches found
No related tags found
No related merge requests found
......@@ -63,13 +63,13 @@ build_linux:
- cmake -Bbuild -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=RelWithDebInfo .
- cmake --build build -j 16
- cd build
- linuxdeploy --plugin qt -e groundstation -d ../deployment/linuxdeploy/groundstation.desktop -i ../deployment/linuxdeploy/SkywardLogo.png --appdir AppDir
- linuxdeploy --plugin qt -e skywardhub -d ../deployment/linuxdeploy/skywardhub.desktop -i ../deployment/linuxdeploy/SkywardLogo.png --appdir AppDir
- appimagetool AppDir
- mv Ground_Station-x86_64.AppImage ../Ground_Station-$CI_COMMIT_SHORT_SHA-x86_64.AppImage
- mv SkywardHub-x86_64.AppImage ../SkywardHub-$CI_COMMIT_SHORT_SHA-x86_64.AppImage
artifacts:
name: Linux AppImage
paths:
- Ground_Station-$CI_COMMIT_SHORT_SHA-x86_64.AppImage
- SkywardHub-$CI_COMMIT_SHORT_SHA-x86_64.AppImage
expire_in: 7 days
build_windows:
......@@ -80,11 +80,11 @@ build_windows:
script:
- x86_64-w64-mingw32.static-cmake -Bbuild -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=RelWithDebInfo .
- x86_64-w64-mingw32.static-cmake --build build -j 16
- mv build/groundstation.exe Ground_Station-$CI_COMMIT_SHORT_SHA.exe
- mv build/skywardhub.exe SkywardHub-$CI_COMMIT_SHORT_SHA.exe
artifacts:
name: Windows executable
paths:
- Ground_Station-$CI_COMMIT_SHORT_SHA.exe
- SkywardHub-$CI_COMMIT_SHORT_SHA.exe
expire_in: 7 days
post_on_slack:
......
......@@ -36,7 +36,12 @@ add_subdirectory(libs/backward-cpp)
# Qt5 and its modules
find_package(Qt5 REQUIRED COMPONENTS Widgets SerialPort PrintSupport 3DCore 3DExtras 3DRender 3DInput)
add_executable(groundstation
add_executable(skywardhub
# Primary files
src/main.cpp
src/application.qrc
# Componets
src/shared/Components/ModulesPicker/ModulesPicker.cpp
src/shared/Components/SaveConfigurationDialog/SaveConfigurationDialog.cpp
src/shared/Components/SubscriptionsPanel/SubscriptionsPanel.cpp
......@@ -44,6 +49,8 @@ add_executable(groundstation
src/shared/Components/ErrorDisplayer/Error.cpp
src/shared/Components/ErrorDisplayer/ErrorDisplayer.cpp
src/shared/Components/FilterSelector/FilterSelector.cpp
# Core
src/shared/Core/Message/Field.cpp
src/shared/Core/Message/Filter.cpp
src/shared/Core/Message/Message.cpp
......@@ -53,6 +60,8 @@ add_executable(groundstation
src/shared/Core/Window/Window.cpp
src/shared/Core/SkywardHubCore.cpp
src/shared/Core/XmlObject.cpp
# Modules
src/shared/Modules/CommandPad/CommandPad.cpp
src/shared/Modules/CommandPad/MessageFormElement.cpp
src/shared/Modules/CompactCommandPad/CompactCommandPad.cpp
......@@ -85,11 +94,9 @@ add_executable(groundstation
src/shared/Modules/ModulesList.cpp
src/shared/Modules/ValvesViewer/ValvesViewer.cpp
src/shared/Modules/Module.cpp
src/entrypoints/groundstation/application.qrc
src/entrypoints/groundstation/main.cpp
)
target_include_directories(groundstation PRIVATE src/shared)
target_link_libraries(groundstation PUBLIC
target_include_directories(skywardhub PRIVATE src/shared)
target_link_libraries(skywardhub PUBLIC
Qt5::Widgets
Qt5::SerialPort
Qt5::PrintSupport
......@@ -100,17 +107,17 @@ target_link_libraries(groundstation PUBLIC
Mavlink::Mavlink
)
set_target_properties(groundstation PROPERTIES AUTOMOC ON)
set_target_properties(groundstation PROPERTIES AUTORCC ON)
set_target_properties(groundstation PROPERTIES AUTOUIC ON)
set_target_properties(skywardhub PROPERTIES AUTOMOC ON)
set_target_properties(skywardhub PROPERTIES AUTORCC ON)
set_target_properties(skywardhub PROPERTIES AUTOUIC ON)
# Prevent the creation of a console window on Windows
set_target_properties(groundstation PROPERTIES WIN32_EXECUTABLE TRUE)
set_target_properties(skywardhub PROPERTIES WIN32_EXECUTABLE TRUE)
# Create an applkication build on MacOS
set_target_properties(groundstation PROPERTIES MACOSX_BUNDLE TRUE)
set_target_properties(skywardhub PROPERTIES MACOSX_BUNDLE TRUE)
add_backward(groundstation)
add_backward(skywardhub)
if(UNIX)
set(BACKWARD_HAS_DW 1)
set(BACKWARD_HAS_LIBUNWIND 1)
......@@ -121,8 +128,8 @@ endif(UNIX)
if(DEFINED ENV{WIN_DEPLOY_QT})
message("-- Using windeployqt.exe from $ENV{WIN_DEPLOY_QT}")
add_custom_command(
TARGET groundstation POST_BUILD
COMMAND $ENV{WIN_DEPLOY_QT} groundstation.exe
TARGET skywardhub POST_BUILD
COMMAND $ENV{WIN_DEPLOY_QT} skywardhub.exe
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Running windeployqt.exe..."
)
......
[Desktop Entry]
Type=Application
Name=Ground Station
Exec=groundstation
Name=SkywardHub
Exec=skywardhub
Icon=SkywardLogo
Categories=Utility;
Terminal=false
......
File moved
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment