Skip to content

Commit 18aae90

Browse files
authored
Merge pull request #314 from crueter/fix/armasm
[cmake] don't apply assembler options to armasm
2 parents 230d5fe + 7115391 commit 18aae90

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
190190
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/safeseh")
191191
endif()
192192

193-
else() # masm
193+
# armasm doesn't support most of these options
194+
elseif(NOT BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) # masm
194195
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
195196
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
196197
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

0 commit comments

Comments
 (0)