Mercurial > hg > orthanc

comparison Resources/CMake/OpenSslConfigurationStatic-1.1.1.cmake @ 3725:8060880d5e66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix openssl
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 06 Mar 2020 10:56:24 +0100
parents f29a75a3190a
children 7b7ca203f1a3
comparison
equal deleted inserted replaced
3724:f29a75a3190a 3725:8060880d5e66
9 endif() 9 endif()
10 10
11 DownloadPackage(${OPENSSL_MD5} ${OPENSSL_URL} "${OPENSSL_SOURCES_DIR}") 11 DownloadPackage(${OPENSSL_MD5} ${OPENSSL_URL} "${OPENSSL_SOURCES_DIR}")
12 12
13 if (FirstRun) 13 if (FirstRun)
14 file(WRITE ${AUTOGENERATED_DIR}/openssl_cversion.c " 14 file(WRITE ${OPENSSL_SOURCES_DIR}/crypto/buildinf.h "
15 #include \"internal/cryptlib.h\" 15 #define DATE \"\"
16 unsigned long OpenSSL_version_num(void) 16 #define PLATFORM \"\"
17 { 17 #define compiler_flags \"\"
18 return OPENSSL_VERSION_NUMBER;
19 }
20 ") 18 ")
21 file(WRITE ${OPENSSL_SOURCES_DIR}/crypto/include/internal/bn_conf.h "") 19 file(WRITE ${OPENSSL_SOURCES_DIR}/crypto/include/internal/bn_conf.h "")
22 file(WRITE ${OPENSSL_SOURCES_DIR}/crypto/include/internal/dso_conf.h "") 20 file(WRITE ${OPENSSL_SOURCES_DIR}/crypto/include/internal/dso_conf.h "")
23 21
24 configure_file( 22 configure_file(
177 175
178 foreach(d ${OPENSSL_SOURCES_SUBDIRS}) 176 foreach(d ${OPENSSL_SOURCES_SUBDIRS})
179 AUX_SOURCE_DIRECTORY(${d} OPENSSL_SOURCES) 177 AUX_SOURCE_DIRECTORY(${d} OPENSSL_SOURCES)
180 endforeach() 178 endforeach()
181 179
182 list(APPEND OPENSSL_SOURCES ${AUTOGENERATED_DIR}/openssl_cversion.c)
183
184 list(REMOVE_ITEM OPENSSL_SOURCES 180 list(REMOVE_ITEM OPENSSL_SOURCES
185 ${OPENSSL_SOURCES_DIR}/crypto/LPdir_nyi.c 181 ${OPENSSL_SOURCES_DIR}/crypto/LPdir_nyi.c
186 ${OPENSSL_SOURCES_DIR}/crypto/LPdir_unix.c 182 ${OPENSSL_SOURCES_DIR}/crypto/LPdir_unix.c
187 ${OPENSSL_SOURCES_DIR}/crypto/LPdir_vms.c 183 ${OPENSSL_SOURCES_DIR}/crypto/LPdir_vms.c
188 ${OPENSSL_SOURCES_DIR}/crypto/LPdir_win.c 184 ${OPENSSL_SOURCES_DIR}/crypto/LPdir_win.c
189 ${OPENSSL_SOURCES_DIR}/crypto/LPdir_win32.c 185 ${OPENSSL_SOURCES_DIR}/crypto/LPdir_win32.c
190 ${OPENSSL_SOURCES_DIR}/crypto/LPdir_wince.c 186 ${OPENSSL_SOURCES_DIR}/crypto/LPdir_wince.c
191 ${OPENSSL_SOURCES_DIR}/crypto/aes/aes_x86core.c 187 ${OPENSSL_SOURCES_DIR}/crypto/aes/aes_x86core.c
192 ${OPENSSL_SOURCES_DIR}/crypto/armcap.c 188 ${OPENSSL_SOURCES_DIR}/crypto/armcap.c
193 ${OPENSSL_SOURCES_DIR}/crypto/bio/bss_dgram.c 189 ${OPENSSL_SOURCES_DIR}/crypto/bio/bss_dgram.c
194 ${OPENSSL_SOURCES_DIR}/crypto/cversion.c
195 ${OPENSSL_SOURCES_DIR}/crypto/des/ncbc_enc.c 190 ${OPENSSL_SOURCES_DIR}/crypto/des/ncbc_enc.c
196 ${OPENSSL_SOURCES_DIR}/crypto/ec/ecp_nistz256.c 191 ${OPENSSL_SOURCES_DIR}/crypto/ec/ecp_nistz256.c
197 ${OPENSSL_SOURCES_DIR}/crypto/ec/ecp_nistz256_table.c 192 ${OPENSSL_SOURCES_DIR}/crypto/ec/ecp_nistz256_table.c
198 ${OPENSSL_SOURCES_DIR}/crypto/engine/eng_devcrypto.c 193 ${OPENSSL_SOURCES_DIR}/crypto/engine/eng_devcrypto.c
199 ${OPENSSL_SOURCES_DIR}/crypto/poly1305/poly1305_base2_44.c # Cannot be compiled with MinGW 194 ${OPENSSL_SOURCES_DIR}/crypto/poly1305/poly1305_base2_44.c # Cannot be compiled with MinGW
209 # system." It is mandatory to define it as a macro, as it is used by 204 # system." It is mandatory to define it as a macro, as it is used by
210 # all the source files that include OpenSSL (e.g. "Core/Toolbox.cpp" 205 # all the source files that include OpenSSL (e.g. "Core/Toolbox.cpp"
211 # or curl) 206 # or curl)
212 add_definitions(-DTHIRTY_TWO_BIT) 207 add_definitions(-DTHIRTY_TWO_BIT)
213 208
209
210 if (NOT CMAKE_COMPILER_IS_GNUCXX OR
211 "${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
212 # This uses a gcc extension
213 add_definitions(
214 -DOPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
215 )
216 endif()
217
218
214 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") 219 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
215 set(OPENSSL_DEFINITIONS 220 set(OPENSSL_DEFINITIONS
216 "${OPENSSL_DEFINITIONS};OPENSSL_SYSNAME_WIN32;SO_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;NO_WINDOWS_BRAINDEATH") 221 "${OPENSSL_DEFINITIONS};OPENSSL_SYSNAME_WIN32;SO_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;NO_WINDOWS_BRAINDEATH")
217 222
218 if (ENABLE_OPENSSL_ENGINES) 223 if (ENABLE_OPENSSL_ENGINES)
219 link_libraries(crypt32) 224 link_libraries(crypt32)
220 endif() 225 endif()
221 226
222 add_definitions( 227 add_definitions(
223 -DOPENSSL_RAND_SEED_OS # ${OPENSSL_SOURCES_DIR}/crypto/rand/rand_win.c 228 -DOPENSSL_RAND_SEED_OS # ${OPENSSL_SOURCES_DIR}/crypto/rand/rand_win.c
224 -DOPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
225 ) 229 )
226 230
227 elseif ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") 231 elseif ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
228 # In order for "crypto/mem_sec.c" to compile on LSB 232 # In order for "crypto/mem_sec.c" to compile on LSB
229 add_definitions( 233 add_definitions(
230 -DOPENSSL_NO_SECURE_MEMORY 234 -DOPENSSL_NO_SECURE_MEMORY
231 -DOPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
232 ) 235 )
233 endif() 236 endif()
234 237
235 238
236 set_source_files_properties( 239 set_source_files_properties(