aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17554fc..66d04ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -308,6 +308,7 @@ endif()
308 308
309if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(aarch64|arm64)") 309if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(aarch64|arm64)")
310 set(HOST_AARCH64 true) 310 set(HOST_AARCH64 true)
311 # disable for now (fails tests)
311 set(ENABLE_ASM false) 312 set(ENABLE_ASM false)
312elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm") 313elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")
313 set(HOST_ARM true) 314 set(HOST_ARM true)
@@ -344,7 +345,9 @@ if(ENABLE_ASM)
344 endif() 345 endif()
345 add_definitions(-DHAVE_GNU_STACK) 346 add_definitions(-DHAVE_GNU_STACK)
346 elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") 347 elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
347 set(HOST_ASM_MACOSX_X86_64 true) 348 # disable for now (.section .rodata invalid)
349 # set(HOST_ASM_MACOSX_X86_64 true)
350 set(ENABLE_ASM false)
348 elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")) 351 elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64"))
349 set(HOST_ASM_MASM_X86_64 true) 352 set(HOST_ASM_MASM_X86_64 true)
350 ENABLE_LANGUAGE(ASM_MASM) 353 ENABLE_LANGUAGE(ASM_MASM)