From bd9978373f2811446a725df41f09398d7d751af9 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 8 Oct 2024 04:47:26 -0500 Subject: [PATCH] don't override language property for ASM files as C As of CMake 3.20, this causes the files to be built _as_ C, instead of just with a C compiler. This also properly specifies the languages in the project call. --- CMakeLists.txt | 2 +- crypto/CMakeLists.txt | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b6294b9f4..9c3d0d4d00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ if(MSVC) cmake_policy(SET CMP0091 NEW) endif() -project (LibreSSL C ASM) +project(LibreSSL LANGUAGES C ASM) include(CheckFunctionExists) include(CheckSymbolExists) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 03d3c2424c..5140a7a46f 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -19,7 +19,6 @@ if(HOST_ASM_ELF_ARMV4) add_definitions(-DSHA256_ASM) add_definitions(-DSHA512_ASM) add_definitions(-DOPENSSL_CPUID_OBJ) - set_property(SOURCE ${ASM_ARMV4_ELF_SRC} PROPERTY LANGUAGE C) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_ARMV4_ELF_SRC}) endif() @@ -69,7 +68,6 @@ if(HOST_ASM_ELF_X86_64) add_definitions(-DWHIRLPOOL_ASM) add_definitions(-DOPENSSL_CPUID_OBJ) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC}) - set_property(SOURCE ${ASM_X86_64_ELF_SRC} PROPERTY LANGUAGE C) endif() if(HOST_ASM_MACOSX_X86_64) @@ -118,7 +116,6 @@ if(HOST_ASM_MACOSX_X86_64) add_definitions(-DWHIRLPOOL_ASM) add_definitions(-DOPENSSL_CPUID_OBJ) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC}) - set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY LANGUAGE C) set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm") endif() @@ -193,7 +190,6 @@ if(HOST_ASM_MINGW64_X86_64) add_definitions(-DWHIRLPOOL_ASM) add_definitions(-DOPENSSL_CPUID_OBJ) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC}) - set_property(SOURCE ${ASM_X86_64_MINGW64_SRC} PROPERTY LANGUAGE C) endif() set(