Skip to content

Commit ef39a89

Browse files
authored
Merge pull request #294 from Challanger524/fix_clang-cl_masm_combo
Fix `clang-cl` `MSVC` frontend received `GNU` flag on assembling
2 parents afd2ce3 + 628cefe commit ef39a89

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

CMakeLists.txt

+8-7
Original file line numberDiff line numberDiff line change
@@ -178,20 +178,21 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
178178

179179
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/nologo")
180180

181-
if(MSVC AND NOT(MSVC_VERSION LESS 1936)) # Visual Studio 2022 version 17.6
181+
if(MSVC AND NOT(MSVC_VERSION LESS 1936) AND NOT(CMAKE_CXX_SIMULATE_VERSION))
182182
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/quiet")
183183
endif()
184184

185185
if(BOOST_CONTEXT_ARCHITECTURE STREQUAL i386)
186186
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/safeseh")
187187
endif()
188-
endif()
189188

190-
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
191-
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
192-
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
193-
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-Wno-unused-command-line-argument")
194-
endif()
189+
else() # masm
190+
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
191+
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
192+
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
193+
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-Wno-unused-command-line-argument")
194+
endif()
195+
endif() # masm
195196

196197
enable_language(${ASM_LANGUAGE})
197198
set_source_files_properties(${ASM_SOURCES} PROPERTIES LANGUAGE ${ASM_LANGUAGE})

0 commit comments

Comments
 (0)