CMake: BUILD_C2A_AS_SILS_FW -> C2A_BUILD_FOR_SILS

arkedge · Oct 5, 2023 · 5ffc505 · 5ffc505
1 parent f7859f6
commit 5ffc505
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,15 +13,15 @@ option(C2A_BUILD_FOR_32BIT          "Build C2A for 32bit target(this will add -m
 ## C2A
 option(C2A_USE_STDINT_WRAPPER       "Use stdint.h wrapper for C89" OFF)
 
+option(C2A_BUILD_FOR_SILS           "Build C2A for SILS target" ON)
+
 # user config
 option(USE_ALL_C2A_CORE_APPS        "use C2A-core all Applications" ON)
 option(USE_ALL_C2A_CORE_TEST_APPS   "use C2A-core all Test Applications" ON)
 option(USE_ALL_C2A_CORE_LIB         "use C2A-core all library" ON)
 
 option(C2A_USE_SIMPLE_LIBC          "use C2A-core hosted simple libc implementation" OFF)
 
-option(BUILD_C2A_AS_SILS_FW         "build C2A as SILS firmware" ON)
-
 set(C2A_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 set(C2A_SRCS

diff --git a/common.cmake b/common.cmake
@@ -20,7 +20,7 @@ else()
   endif()
 endif()
 
-if(BUILD_C2A_AS_SILS_FW)
+if(C2A_BUILD_FOR_SILS )
   target_compile_definitions(${PROJECT_NAME} PUBLIC SILS_FW)
 endif()
 

diff --git a/examples/mobc/CMakeLists.txt b/examples/mobc/CMakeLists.txt
@@ -18,7 +18,7 @@ option(USE_SCI_COM_UART "Use SCI_COM_UART" OFF)
 
 option(USE_SILS_MOCKUP "Use SILS mockup for build C2A with minimal user in C89 only" OFF)
 
-option(BUILD_C2A_AS_SILS_FW "Build C2A as SILS firmware" ON)
+option(C2A_BUILD_FOR_SILS "Build C2A for SILS target" ON)
 
 if(USE_SILS_MOCKUP)
   set(C2A_BUILD_AS_CXX OFF)

diff --git a/examples/mobc/build.rs b/examples/mobc/build.rs
@@ -5,7 +5,7 @@ fn main() {
         .very_verbose(true)
         .define("C2A_BUILD_FOR_32BIT", "OFF")
         .define("C2A_BUILD_AS_C99", "ON")
-        .define("BUILD_C2A_AS_SILS_FW", "ON")
+        .define("C2A_BUILD_FOR_SILS", "ON")
         .define("USE_SCI_COM_WINGS", "OFF")
         .build_target("C2A");
 

diff --git a/examples/subobc/CMakeLists.txt b/examples/subobc/CMakeLists.txt
@@ -12,7 +12,7 @@ option(USE_SCI_COM_WINGS "Use SCI_COM_WINGS" ON)
 
 option(USE_SILS_MOCKUP "Use SILS mockup for build C2A with minimal user in C89 only" OFF)
 
-option(BUILD_C2A_AS_SILS_FW "Build C2A as SILS firmware" ON)
+option(C2A_BUILD_FOR_SILS "Build C2A for SILS target" ON)
 
 set(USE_ALL_C2A_CORE_APPS OFF)
 # Core App のターゲット追加は src_user/applications/CMakeLists.txt で行う

diff --git a/examples/subobc/build.rs b/examples/subobc/build.rs
@@ -5,7 +5,7 @@ fn main() {
         .very_verbose(true)
         .define("C2A_BUILD_FOR_32BIT", "ON")
         .define("C2A_BUILD_AS_C99", "ON")
-        .define("BUILD_C2A_AS_SILS_FW", "ON")
+        .define("C2A_BUILD_FOR_SILS ", "ON")
         .define("USE_SCI_COM_WINGS", "OFF")
         .build_target("C2A");
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ else() @@
       endif()
     endif()
-    if(BUILD_C2A_AS_SILS_FW)
+    if(C2A_BUILD_FOR_SILS )
       target_compile_definitions(${PROJECT_NAME} PUBLIC SILS_FW)
     endif()
@@ Expand Down @@