소스 검색

fix cmake

blueloveTH 8 달 전
부모
커밋
1194497b5c
2개의 변경된 파일2개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      .github/workflows/main.yml
  2. 1 2
      CMakeLists.txt

+ 1 - 1
.github/workflows/main.yml

@@ -162,7 +162,7 @@ jobs:
           uses: jirutka/setup-alpine@v1
           with:
             arch: ${{ matrix.arch }}
-            packages: gcc g++ make cmake libc-dev linux-headers python3
+            packages: gcc g++ make cmake libc-dev linux-headers python3 git
         - name: Build and Test
           run: |
             echo "Building for architecture: ${{ matrix.arch }}"

+ 1 - 2
CMakeLists.txt

@@ -14,8 +14,7 @@ endif()
 
 if(MSVC)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8 /jumptablerdata")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /experimental:c11atomics")
-    add_compile_options(/wd4267 /wd4244 /wd4146)
+    add_compile_options(/wd4267 /wd4244 /wd4146 /experimental:c11atomics)
 
     if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Ox")