diff options
author | Brent Cook <busterb@gmail.com> | 2024-10-08 04:47:26 -0500 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2024-10-08 04:49:46 -0500 |
commit | bd9978373f2811446a725df41f09398d7d751af9 (patch) | |
tree | dbae7d2aa49030d1dbbb263daf93f1168e36157a /crypto | |
parent | 9a399d26a05396d9cfe1d1f6232e81f37c2acf21 (diff) | |
download | portable-bd9978373f2811446a725df41f09398d7d751af9.tar.gz portable-bd9978373f2811446a725df41f09398d7d751af9.tar.bz2 portable-bd9978373f2811446a725df41f09398d7d751af9.zip |
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.
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/CMakeLists.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 03d3c24..5140a7a 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
@@ -19,7 +19,6 @@ if(HOST_ASM_ELF_ARMV4) | |||
19 | add_definitions(-DSHA256_ASM) | 19 | add_definitions(-DSHA256_ASM) |
20 | add_definitions(-DSHA512_ASM) | 20 | add_definitions(-DSHA512_ASM) |
21 | add_definitions(-DOPENSSL_CPUID_OBJ) | 21 | add_definitions(-DOPENSSL_CPUID_OBJ) |
22 | set_property(SOURCE ${ASM_ARMV4_ELF_SRC} PROPERTY LANGUAGE C) | ||
23 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_ARMV4_ELF_SRC}) | 22 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_ARMV4_ELF_SRC}) |
24 | endif() | 23 | endif() |
25 | 24 | ||
@@ -69,7 +68,6 @@ if(HOST_ASM_ELF_X86_64) | |||
69 | add_definitions(-DWHIRLPOOL_ASM) | 68 | add_definitions(-DWHIRLPOOL_ASM) |
70 | add_definitions(-DOPENSSL_CPUID_OBJ) | 69 | add_definitions(-DOPENSSL_CPUID_OBJ) |
71 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC}) | 70 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC}) |
72 | set_property(SOURCE ${ASM_X86_64_ELF_SRC} PROPERTY LANGUAGE C) | ||
73 | endif() | 71 | endif() |
74 | 72 | ||
75 | if(HOST_ASM_MACOSX_X86_64) | 73 | if(HOST_ASM_MACOSX_X86_64) |
@@ -118,7 +116,6 @@ if(HOST_ASM_MACOSX_X86_64) | |||
118 | add_definitions(-DWHIRLPOOL_ASM) | 116 | add_definitions(-DWHIRLPOOL_ASM) |
119 | add_definitions(-DOPENSSL_CPUID_OBJ) | 117 | add_definitions(-DOPENSSL_CPUID_OBJ) |
120 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC}) | 118 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC}) |
121 | set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY LANGUAGE C) | ||
122 | set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm") | 119 | set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm") |
123 | endif() | 120 | endif() |
124 | 121 | ||
@@ -193,7 +190,6 @@ if(HOST_ASM_MINGW64_X86_64) | |||
193 | add_definitions(-DWHIRLPOOL_ASM) | 190 | add_definitions(-DWHIRLPOOL_ASM) |
194 | add_definitions(-DOPENSSL_CPUID_OBJ) | 191 | add_definitions(-DOPENSSL_CPUID_OBJ) |
195 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC}) | 192 | set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC}) |
196 | set_property(SOURCE ${ASM_X86_64_MINGW64_SRC} PROPERTY LANGUAGE C) | ||
197 | endif() | 193 | endif() |
198 | 194 | ||
199 | set( | 195 | set( |