Skip to content

Commit c8ce7c7

Browse files
authored
Use compliant preprocessor (#109)
1 parent 14df45a commit c8ce7c7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ target_compile_features(common-compile-settings INTERFACE cxx_std_11)
6060
target_compile_options(common-compile-settings INTERFACE
6161
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
6262
-Wall -Wextra -Wno-unused-parameter -Wno-type-limits -Werror>
63-
$<$<CXX_COMPILER_ID:MSVC>:/W0 /D_WIN32_WINNT=0x0A00 /EHsc>
63+
$<$<CXX_COMPILER_ID:MSVC>:/W0 /D_WIN32_WINNT=0x0A00 /EHsc /Zc:preprocessor>
6464
)
6565

6666
#

protobuf/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ if(${TRITON_COMMON_ENABLE_PROTOBUF})
6767
proto-library PRIVATE
6868
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
6969
-Wall -Wextra -Wno-unused-parameter -Werror>
70-
$<$<CXX_COMPILER_ID:MSVC>:/W0 /D_WIN32_WINNT=0x0A00 /EHsc>
70+
$<$<CXX_COMPILER_ID:MSVC>:/W0 /D_WIN32_WINNT=0x0A00 /EHsc /Zc:preprocessor>
7171
)
7272

7373
set_target_properties(
@@ -140,7 +140,7 @@ if(${TRITON_COMMON_ENABLE_GRPC})
140140
grpc-service-library PRIVATE
141141
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
142142
-Wall -Wextra -Wno-unused-parameter -Werror>
143-
$<$<CXX_COMPILER_ID:MSVC>:/W0 /D_WIN32_WINNT=0x0A00 /EHsc>
143+
$<$<CXX_COMPILER_ID:MSVC>:/W0 /D_WIN32_WINNT=0x0A00 /EHsc /Zc:preprocessor>
144144
)
145145

146146
set_target_properties(
@@ -197,7 +197,7 @@ if(${TRITON_COMMON_ENABLE_GRPC})
197197
grpc-health-library PRIVATE
198198
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
199199
-Wall -Wextra -Wno-unused-parameter -Werror>
200-
$<$<CXX_COMPILER_ID:MSVC>:/W0 /D_WIN32_WINNT=0x0A00 /EHsc>
200+
$<$<CXX_COMPILER_ID:MSVC>:/W0 /D_WIN32_WINNT=0x0A00 /EHsc /Zc:preprocessor>
201201
)
202202

203203
set_target_properties(

0 commit comments

Comments
 (0)