Skip to content

Commit

Permalink
CI: Winblows fix 2
Browse files Browse the repository at this point in the history
I did try to go with self-compiled sherpa first, but it was painful so yeah.. if this doesn't do it I'll try again
  • Loading branch information
DatCaptainHorse committed Mar 22, 2024
1 parent 95b2195 commit 0dd6e9c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ target_compile_definitions(ChatNotifier PRIVATE
$<$<BOOL:${WIN32}>:_CRT_SECURE_NO_WARNINGS>
)

# Static runtime
if (WIN32)
# Static runtime
set_property(TARGET ChatNotifier PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
# Also allow multiple definitions
target_link_options(ChatNotifier PRIVATE /FORCE:MULTIPLE)
endif ()
2 changes: 2 additions & 0 deletions cmake/modules/FetchDeps.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ FetchContent_Declare(
# BUILD_SHARED, BUILD_EXAMPLES to OFF, we don't need them
set(BUILD_SHARED OFF CACHE BOOL "" FORCE)
set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
# We want static-static
set(BUILD_FOR_MT ON CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(libhv)

# Fetch glaze
Expand Down

0 comments on commit 0dd6e9c

Please sign in to comment.