fix cmake

ut-issl · Nov 28, 2021 · c5c4920 · c5c4920
1 parent 8f1e1ee
commit c5c4920
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/build_as_c89.yml b/.github/workflows/build_as_c89.yml
@@ -34,7 +34,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DUSE_SILS_MOCKUP=ON -DCMAKE_C_FLAGS="-Werror"
+          cmake .. -DUSE_SILS_MOCKUP=ON -DADD_WERROR_FLAGS=OK
 
       - name: build
         working-directory: ./Examples/minimum_user_for_s2e/build

diff --git a/.github/workflows/build_as_c89_wextra.yml b/.github/workflows/build_as_c89_wextra.yml
@@ -34,7 +34,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DUSE_SILS_MOCKUP=ON -DCMAKE_C_FLAGS="-Wextra"
+          cmake .. -DUSE_SILS_MOCKUP=ON -DADD_WEXTRA_FLAGS=OK
 
       - name: build
         working-directory: ./Examples/minimum_user_for_s2e/build

diff --git a/Examples/minimum_user_for_s2e/CMakeLists.txt b/Examples/minimum_user_for_s2e/CMakeLists.txt
@@ -166,10 +166,16 @@ endif()
 
 # Compile option
 if(MSVC)
-    target_compile_options(${PROJECT_NAME} PUBLIC "/W4")
-    target_compile_options(${PROJECT_NAME} PUBLIC "/TP") # Compile C codes as C++
+  target_compile_options(${PROJECT_NAME} PUBLIC "/W4")
+  target_compile_options(${PROJECT_NAME} PUBLIC "/TP") # Compile C codes as C++
 else()
   target_compile_options(${PROJECT_NAME} PUBLIC "${CMAKE_CXX_FLAGS}-Wall")
   set(CMAKE_CXX_FLAGS "-finput-charset=cp932 -m32 -rdynamic -Wall -g -Wno-unknown-pragma")  # SJIS, 32bit
   set(CMAKE_C_FLAGS "-finput-charset=cp932 -m32 -rdynamic -Wall -g -Wno-unknown-pragmas") # SJIS, 32bit
+  if(ADD_WERROR_FLAGS)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+  endif()
+  if(ADD_WEXTRA_FLAGS)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
+  endif()
 endif()