Mercurial > hg > orthanc

comparison Resources/CMake/OpenSslConfigurationStatic-1.1.1.cmake @ 3721:c575fb0adf91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgraded jsoncpp to 0.10.7 for pre-C++11 compilers
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 05 Mar 2020 18:34:25 +0100
parents faa695f433d5
children a49d49d945c9
comparison
equal deleted inserted replaced
3720:faa695f433d5 3721:c575fb0adf91
18 return OPENSSL_VERSION_NUMBER; 18 return OPENSSL_VERSION_NUMBER;
19 } 19 }
20 ") 20 ")
21 file(WRITE ${OPENSSL_SOURCES_DIR}/crypto/include/internal/bn_conf.h "") 21 file(WRITE ${OPENSSL_SOURCES_DIR}/crypto/include/internal/bn_conf.h "")
22 file(WRITE ${OPENSSL_SOURCES_DIR}/crypto/include/internal/dso_conf.h "") 22 file(WRITE ${OPENSSL_SOURCES_DIR}/crypto/include/internal/dso_conf.h "")
23
24 # Enabling deprecated API is needed for civetweb
25 # file(WRITE ${OPENSSL_SOURCES_DIR}/include/openssl/opensslconf.h "
26 # #define DEPRECATEDIN_1_2_0(f) f;
27 # #define DEPRECATEDIN_1_1_0(f) f;
28 # #define DEPRECATEDIN_0_9_8(f) f;
29 # ")
23 30
24 # Apply the patches 31 # Apply the patches
25 execute_process( 32 execute_process(
26 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i 33 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
27 ${ORTHANC_ROOT}/Resources/Patches/openssl-1.1.1d.patch 34 ${ORTHANC_ROOT}/Resources/Patches/openssl-1.1.1d.patch
64 -DOPENSSL_NO_SEED 71 -DOPENSSL_NO_SEED
65 -DOPENSSL_NO_WHIRLPOOL 72 -DOPENSSL_NO_WHIRLPOOL
66 -DOPENSSL_NO_RIPEMD 73 -DOPENSSL_NO_RIPEMD
67 74
68 -DOPENSSLDIR="/usr/local/ssl" 75 -DOPENSSLDIR="/usr/local/ssl"
76 -DOPENSSL_NO_ERR
69 ) 77 )
70 78
71 79
72 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") 80 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
73 # In order for "crypto/mem_sec.c" to compile on LSB 81 # In order for "crypto/mem_sec.c" to compile on LSB
202 ${OPENSSL_SOURCES_DIR}/crypto/ppccap.c 210 ${OPENSSL_SOURCES_DIR}/crypto/ppccap.c
203 ${OPENSSL_SOURCES_DIR}/crypto/s390xcap.c 211 ${OPENSSL_SOURCES_DIR}/crypto/s390xcap.c
204 ${OPENSSL_SOURCES_DIR}/crypto/sparcv9cap.c 212 ${OPENSSL_SOURCES_DIR}/crypto/sparcv9cap.c
205 ) 213 )
206 214
207 # Check out "${OPENSSL_SOURCES_DIR}/Configurations/README": "this is 215 # Check out "${OPENSSL_SOURCES_DIR}/Configurations/README": "This is
208 # default if no option is specified, it works on any supported system" 216 # default if no option is specified, it works on any supported
209 set(OPENSSL_DEFINITIONS "THIRTY_TWO_BIT") 217 # system." It is mandatory to define it as a macro, as it is used by
218 # all the source files that include OpenSSL (e.g. "Core/Toolbox.cpp"
219 # or curl)
220 add_definitions(-DTHIRTY_TWO_BIT)
210 221
211 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") 222 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
212 set(OPENSSL_DEFINITIONS 223 set(OPENSSL_DEFINITIONS
213 "${OPENSSL_DEFINITIONS};OPENSSL_SYSNAME_WIN32;SO_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN") 224 "${OPENSSL_DEFINITIONS};OPENSSL_SYSNAME_WIN32;SO_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;NO_WINDOWS_BRAINDEATH")
214 225
215 if (ENABLE_OPENSSL_ENGINES) 226 if (ENABLE_OPENSSL_ENGINES)
216 link_libraries(crypt32) 227 link_libraries(crypt32)
217 endif() 228 endif()
218 endif() 229 endif()
219 230
220 set_source_files_properties( 231 set_source_files_properties(
221 ${OPENSSL_SOURCES} 232 ${OPENSSL_SOURCES}
222 PROPERTIES COMPILE_DEFINITIONS 233 PROPERTIES COMPILE_DEFINITIONS
223 "${OPENSSL_DEFINITIONS};DSO_NONE;NO_WINDOWS_BRAINDEATH" 234 "${OPENSSL_DEFINITIONS};DSO_NONE"
224 ) 235 )