Skip to content

Commit

Permalink
Merge pull request #627 from ut-issl/main
Browse files Browse the repository at this point in the history
Merge main to develop for v7.2.5 patch update
  • Loading branch information
200km committed Mar 8, 2024
2 parents c211efc + 87e7863 commit 80d54ff
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ cmake_minimum_required(VERSION 3.13)
project(S2E
LANGUAGES CXX
DESCRIPTION "S2E: Spacecraft Simulation Environment"
VERSION 7.2.4
VERSION 7.2.5
)

# build config
option(USE_HILS "Use HILS" OFF)
option(USE_C2A "Use C2A" OFF)
option(USE_C2A_COMMAND_SENDER "Use command sender to C2A" OFF)
option(BUILD_64BIT "Build 64bit" OFF)
option(GOOGLE_TEST "Execute GoogleTest" OFF)

Expand Down
8 changes: 7 additions & 1 deletion src/components/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ real/cdh/on_board_computer_with_c2a.cpp
real/communication/antenna.cpp
real/communication/antenna_radiation_pattern.cpp
real/communication/ground_station_calculator.cpp
real/communication/wings_command_sender_to_c2a.cpp

examples/example_change_structure.cpp
examples/example_serial_communication_with_obc.cpp
Expand Down Expand Up @@ -63,6 +62,13 @@ if(USE_HILS)
)
endif()

if(USE_C2A_COMMAND_SENDER)
set(SOURCE_FILES
${SOURCE_FILES}
real/communication/wings_command_sender.cpp
)
endif()

add_library(${PROJECT_NAME} STATIC
${SOURCE_FILES}
)
Expand Down

0 comments on commit 80d54ff

Please sign in to comment.