Skip to content

Commit

Permalink
Fix compile-options for mini_chromium and crashpad_util on MSVC
Browse files Browse the repository at this point in the history
  • Loading branch information
supervacuus committed Sep 29, 2023
1 parent 0e7a4f6 commit 695d159
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 5 additions & 1 deletion third_party/mini_chromium/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,11 @@ target_link_libraries(mini_chromium
if(WIN32)
target_link_libraries(mini_chromium PRIVATE advapi32 kernel32)
if(MSVC)
target_compile_options(mini_chromium PRIVATE "/wd4201" "/wd4996")
target_compile_options(mini_chromium PRIVATE
$<$<COMPILE_LANGUAGE:C,CXX>:/wd4201> # nonstandard extension used : nameless struct/union.
$<$<COMPILE_LANGUAGE:C,CXX>:/wd4244> # conversion from '__int64' to 'int32_t', possible loss of data.
$<$<COMPILE_LANGUAGE:C,CXX>:/wd4996> # 'X' was declared deprecated.
)
target_compile_definitions(mini_chromium PRIVATE
NOMINMAX
UNICODE
Expand Down
4 changes: 3 additions & 1 deletion util/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,9 @@ endif()
if(WIN32)
target_link_libraries(crashpad_util PRIVATE user32 version winhttp)
if(MSVC)
target_compile_options(crashpad_util PRIVATE "/wd4201")
target_compile_options(crashpad_util PRIVATE
$<$<COMPILE_LANGUAGE:C,CXX>:/wd4201> # nonstandard extension used : nameless struct/union.
)
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(CMAKE_ASM_MASM_FLAGS "${CMAKE_ASM_MASM_FLAGS} /safeseh")
endif()
Expand Down

0 comments on commit 695d159

Please sign in to comment.