Skip to content
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

Use compliant preprocessor on windows #6626

Merged
merged 2 commits into from
Nov 22, 2023
Merged

Use compliant preprocessor on windows #6626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
423174d
Use compliant preprocessor
tanmayv25 Nov 21, 2023
0b8aa38
Merge branch 'main' into tanmayv-nvtx
tanmayv25 Nov 22, 2023
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
10 changes: 5 additions & 5 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
target_compile_options(
main
PRIVATE
/W1 /D_WIN32_WINNT=0x0A00 /EHsc
/W1 /D_WIN32_WINNT=0x0A00 /EHsc /Zc:preprocessor
)
target_compile_definitions(main
PRIVATE
Expand Down Expand Up @@ -358,7 +358,7 @@ if(${TRITON_ENABLE_HTTP}
target_compile_options(
http-endpoint-library
PRIVATE
/W1 /D_WIN32_WINNT=0x0A00 /EHsc
/W1 /D_WIN32_WINNT=0x0A00 /EHsc /Zc:preprocessor
)
else()
target_compile_options(
Expand Down Expand Up @@ -600,7 +600,7 @@ if (NOT WIN32)
target_compile_options(
simple
PRIVATE
/W1 /D_WIN32_WINNT=0x0A00 /EHsc
/W1 /D_WIN32_WINNT=0x0A00 /EHsc /Zc:preprocessor
)
else()
target_compile_options(
Expand Down Expand Up @@ -664,7 +664,7 @@ if (NOT WIN32)
target_compile_options(
multi_server
PRIVATE
/W1 /D_WIN32_WINNT=0x0A00 /EHsc
/W1 /D_WIN32_WINNT=0x0A00 /EHsc /Zc:preprocessor
)
else()
target_compile_options(
Expand Down Expand Up @@ -729,7 +729,7 @@ if (NOT WIN32)
target_compile_options(
memory_alloc
PRIVATE
/W1 /D_WIN32_WINNT=0x0A00 /EHsc
/W1 /D_WIN32_WINNT=0x0A00 /EHsc /Zc:preprocessor
)
else()
target_compile_options(
Expand Down
2 changes: 1 addition & 1 deletion src/grpc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
target_compile_options(
grpc-endpoint-library
PRIVATE
/W1 /D_WIN32_WINNT=0x0A00 /EHsc
/W1 /D_WIN32_WINNT=0x0A00 /EHsc /Zc:preprocessor
)
else()
target_compile_options(
Expand Down
Loading