From 49eabdcb1619ea691e2b6d78ffb82ce60e47d20f Mon Sep 17 00:00:00 2001 From: kinichiro Date: Fri, 15 Apr 2016 14:24:00 +0900 Subject: organize enabling asm condition in cmake - add amd64 as same as x86_64 - add solaris(i386) --- CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 447c3f3..9639f89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,12 +189,16 @@ if(HAVE_ERR_H) add_definitions(-DHAVE_ERR_H) endif() -if("${CMAKE_C_COMPILER_ABI}" STREQUAL "ELF" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND ENABLE_ASM) - set(HOST_ASM_ELF_X86_64 true) -endif() - -if(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND ENABLE_ASM) - set(HOST_ASM_MACOSX_X86_64 true) +if(ENABLE_ASM) + if("${CMAKE_C_COMPILER_ABI}" STREQUAL "ELF") + if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86_64|amd64)") + set(HOST_ASM_ELF_X86_64 true) + elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386") + set(HOST_ASM_ELF_X86_64 true) + endif() + elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") + set(HOST_ASM_MACOSX_X86_64 true) + endif() endif() set(OPENSSL_LIBS ssl crypto) -- cgit v1.2.3-55-g6feb