From 495a1b631687f6cc1a1e9fe217aa17184a1b4aff Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 21 Jan 2019 20:15:30 -0600 Subject: [PATCH] more masm fixes, but disable for now --- CMakeLists.txt | 7 +++++-- crypto/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c79743..46e01ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ${CMAKE_MODULE_PATH}) include(cmake_export_symbol) include(GNUInstallDirs) -project (LibreSSL C) +project (LibreSSL C ASM) enable_testing() @@ -273,7 +273,10 @@ if(ENABLE_ASM) endif() elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") set(HOST_ASM_MACOSX_X86_64 true) - elseif(MSVC AND "${CMAKE_GENERATOR}" MATCHES "Win64") + elseif(MSVC AND "${CMAKE_GENERATOR}" MATCHES "Win64" AND FALSE) + # XXX Disabled for now, CMake's MASM support seems to either never + # build supply ASM or build it with the C compiler in a mode where it + # does not parse correctly. It might be easier to get NASM support working. set(HOST_ASM_MASM_X86_64 true) ENABLE_LANGUAGE(ASM_MASM) elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 796f835..a81d329 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -147,7 +147,7 @@ if(HOST_ASM_MASM_X86_64) add_definitions(-DWHIRLPOOL_ASM) add_definitions(-DOPENSSL_CPUID_OBJ) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) - set_property(SOURCE ${ASM_X86_64_MINGW64_SRC} PROPERTY LANGUAGE C) + set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE C) endif() if(HOST_ASM_MINGW64_X86_64)