Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor user cmake option #132

Merged
merged 5 commits into from
Oct 12, 2023
+20 −22
Merged

Refactor user cmake option #132

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d0adcb
CMake: USE_SILS_MOCKUP -> C2A_BUILD_WITH_SILS_MOCKUP
sksat Oct 12, 2023
1957734
CMake: SHOW_DEBUG_PRINT_ON_SILS -> C2A_SHOW_DEBUG_PRINT_ON_SILS
sksat Oct 12, 2023
f8f3f48
CMake: USE_SCI_COM_WINGS -> C2A_USE_SCI_COM_WINGS, USE_SCI_COM_UART -…
sksat Oct 12, 2023
baac4e4
update comment
sksat Oct 12, 2023
1a54a0e
update CMake option config in example user c2a-sils-runtime build
sksat Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
CMake: USE_SCI_COM_WINGS -> C2A_USE_SCI_COM_WINGS, USE_SCI_COM_UART -… 
…> C2A_USE_SCI_COM_UART
@sksat
sksat committed Oct 12, 2023
commit f8f3f481971ad1b247ee413fa71b1174dc5527cb
4 changes: 2 additions & 2 deletions examples/mobc/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@ project(C2A)
# ！！！注意！！！
# これをONにした状態で，SCIの受け口がない場合（TMTC IFが動いてない状態）
# そちらのバッファが詰まってSILSの動作が止まることがあるので注意すること！
option(USE_SCI_COM_WINGS "Use SCI_COM_WINGS" ON)
option(C2A_USE_SCI_COM_WINGS "Use SCI_COM_WINGS" ON)

# SCI COM for connection to PC UART
# ！！！注意！！！
# これをONにした状態で，SCIの受け口がない場合（受けてのTeratermが起動していない状態）
# そちらのバッファが詰まってSILSの動作が止まることがあるので注意すること！
option(USE_SCI_COM_UART "Use SCI_COM_UART" OFF)
option(C2A_USE_SCI_COM_UART "Use SCI_COM_UART" OFF)

option(C2A_BUILD_WITH_SILS_MOCKUP "Build C2A with SILS mockup for check undefined symbols by build minimal C2A user executable(C89 only)" OFF)

4 changes: 2 additions & 2 deletions examples/mobc/src/src_user/hal/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ else()
sils/wdt_sils.cpp
)

if(USE_SCI_COM_WINGS)
if(C2A_USE_SCI_COM_WINGS)
add_definitions(-DUSE_SCI_COM_WINGS)
#target_sources(${PROJECT_NAME} PUBLIC
set(C2A_HAL_COM_WINGS_SRCS
@@ -35,7 +35,7 @@ else()
message("USE SCI_COM_WINGS")
endif()

if(USE_SCI_COM_UART)
if(C2A_USE_SCI_COM_UART)
add_definitions(-DUSE_SCI_COM_UART)
#target_sources(${PROJECT_NAME} PUBLIC
set(C2A_HAL_COM_UART_SRCS
2 changes: 1 addition & 1 deletion examples/subobc/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ project(C2A)
# ！！！注意！！！
# これをONにした状態で，SCIの受け口がない場合（TMTC IFが動いてない状態）
# そちらのバッファが詰まってSILSの動作が止まることがあるので注意すること！
option(USE_SCI_COM_WINGS "Use SCI_COM_WINGS" ON)
option(C2A_USE_SCI_COM_WINGS "Use SCI_COM_WINGS" ON)

option(C2A_BUILD_WITH_SILS_MOCKUP "Build C2A with SILS mockup for check undefined symbols by build minimal C2A user executable(C89 only)" OFF)

2 changes: 1 addition & 1 deletion examples/subobc/src/src_user/hal/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ else()
sils/wdt_sils.cpp
)

if(USE_SCI_COM_WINGS) # TODO: これ USE_SCI_COM_UART では？
if(C2A_USE_SCI_COM_WINGS) # TODO: これ USE_SCI_COM_UART では？
add_definitions(-DUSE_SCI_COM_WINGS)
#target_sources(${PROJECT_NAME} PUBLIC
set(C2A_HAL_COM_UART_SRCS