summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt19
1 files changed, 11 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa2154cb1..4b27e0c5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,15 +54,18 @@ function(detect_architecture symbol arch)
54 endif() 54 endif()
55endfunction() 55endfunction()
56 56
57if (MSVC) 57if (NOT ENABLE_GENERIC)
58 detect_architecture("_M_AMD64" x86_64) 58 if (MSVC)
59 detect_architecture("_M_IX86" x86) 59 detect_architecture("_M_AMD64" x86_64)
60 detect_architecture("_M_ARM" ARM) 60 detect_architecture("_M_IX86" x86)
61else() 61 detect_architecture("_M_ARM" ARM)
62 detect_architecture("__x86_64__" x86_64) 62 else()
63 detect_architecture("__i386__" x86) 63 detect_architecture("__x86_64__" x86_64)
64 detect_architecture("__arm__" ARM) 64 detect_architecture("__i386__" x86)
65 detect_architecture("__arm__" ARM)
66 endif()
65endif() 67endif()
68
66if (NOT DEFINED ARCHITECTURE) 69if (NOT DEFINED ARCHITECTURE)
67 set(ARCHITECTURE "GENERIC") 70 set(ARCHITECTURE "GENERIC")
68 set(ARCHITECTURE_GENERIC 1) 71 set(ARCHITECTURE_GENERIC 1)