Skip to content

Restore caller compile options after configuring zlib-ng #135127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ProjektMing wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Restore caller compile options after configuring zlib-ng #135127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/mono/mono/component/debugger-protocol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

/*
* Processor architecture constants for GetSystemInformation command.
* These values must match PROCESSOR_ARCHITECTURE_* from winnt.h — do not change them.
* These values must match PROCESSOR_ARCHITECTURE_* from winnt.h - do not change them.
*/
#define CYCORDEBUG_PROCESSOR_ARCHITECTURE_INTEL 0
#define CYCORDEBUG_PROCESSOR_ARCHITECTURE_ARM 5
Expand Down
9 changes: 7 additions & 2 deletions src/native/external/zlib-ng.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ endif()

if (MSVC)
#zlib-ng sets /utf-8 which clashes with /source-charset:utf-8 that we set centrally
get_directory_property(dirCompileOptions COMPILE_OPTIONS)
string(REPLACE "/source-charset:utf-8" "" dirCompileOptions "${dirCompileOptions}")
get_directory_property(zlibngOriginalCompileOptions COMPILE_OPTIONS)
string(REPLACE "/source-charset:utf-8" "" dirCompileOptions "${zlibngOriginalCompileOptions}")
set_directory_properties(PROPERTIES COMPILE_OPTIONS "${dirCompileOptions}")
endif()

Expand All @@ -65,6 +65,11 @@ set(SKIP_INSTALL_ALL ON)
FetchContent_MakeAvailable(fetchzlibng)
set(SKIP_INSTALL_ALL OFF)

if (MSVC)
set_directory_properties(PROPERTIES COMPILE_OPTIONS "${zlibngOriginalCompileOptions}")
unset(zlibngOriginalCompileOptions)
endif()

set_property(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/zlib-ng PROPERTY MSVC_WARNING_LEVEL 3) # Set the MSVC warning level for all zlib-ng targets to 3.
target_compile_options(zlib PRIVATE $<$<COMPILE_LANG_AND_ID:C,Clang,AppleClang>:-Wno-unused-command-line-argument>) # Make sure MacOS respects ignoring unused CLI arguments
target_compile_options(zlib PRIVATE $<$<COMPILE_LANG_AND_ID:C,Clang,AppleClang>:-Wno-logical-op-parentheses>) # place parentheses around the '&&' expression to silence this warning
Expand Down
Loading