Skip to content

Commit f5769ed

Browse files
committed
Move msvcrt shenanigans out into workflow
1 parent a79b131 commit f5769ed

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

.github/workflows/build-windows.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,14 @@ jobs:
2323
tag: v1.14.0
2424

2525
- name: Configure CMake
26-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -GNinja
26+
run: |
27+
cmake\
28+
-B ${{github.workspace}}/build\
29+
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}\
30+
-DCMAKE_C_COMPILER=cl\
31+
-DCMAKE_CXX_COMPILER=cl\
32+
-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded\
33+
-GNinja
2734
2835
- name: Build with GCC
2936
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

bitreader/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@ cmake_minimum_required(VERSION 3.15)
22

33
set(BRCPP_SANITIZER "none" CACHE STRING "Compile with a specific Clang sanitizer (address,undefined,leak,memory,type)")
44

5-
function(brcpp_add_cxx_flags FLAGS)
6-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}")
7-
endfunction()
8-
9-
function(brcpp_add_exe_link_flags FLAGS)
10-
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${FLAGS}")
11-
endfunction()
12-
135
function(brcpp_enable_sanitizer SAN)
146
if (NOT SAN MATCHES "none")
157
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -28,9 +20,6 @@ if (NOT WIN32)
2820
add_compile_options(-Wshorten-64-to-32)
2921
endif()
3022
add_compile_options(-Wall -Wconversion -Wsign-conversion -Werror -pedantic)
31-
else()
32-
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
33-
message(STATUS "MSVC runtime: ${CMAKE_MSVC_RUNTIME_LIBRARY}")
3423
endif()
3524

3625
set(BITREADER_SOURCES

0 commit comments

Comments
 (0)