Mercurial > hg > orthanc

comparison Resources/CMake/OpenSslConfiguration.cmake @ 1537:fbf763bb1fa3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error detection in patches
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 13 Aug 2015 15:25:38 +0200
parents 766a42aac55d
children 76c332bcc6d1
comparison
equal deleted inserted replaced
1536:1b03676d68c2 1537:fbf763bb1fa3
1 if (STATIC_BUILD OR NOT USE_SYSTEM_OPENSSL) 1 if (STATIC_BUILD OR NOT USE_SYSTEM_OPENSSL)
2 SET(OPENSSL_SOURCES_DIR ${CMAKE_BINARY_DIR}/openssl-1.0.2d) 2 SET(OPENSSL_SOURCES_DIR ${CMAKE_BINARY_DIR}/openssl-1.0.2d)
3 DownloadPackage( 3 SET(OPENSSL_URL "www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/openssl-1.0.2d.tar.gz")
4 "38dd619b2e77cbac69b99f52a053d25a" 4 SET(OPENSSL_MD5 "38dd619b2e77cbac69b99f52a053d25a")
5 "www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/openssl-1.0.2d.tar.gz" 5
6 "${OPENSSL_SOURCES_DIR}") 6 if (IS_DIRECTORY "${OPENSSL_SOURCES_DIR}")
7 set(FirstRun OFF)
8 else()
9 set(FirstRun ON)
10 endif()
11
12 DownloadPackage(${OPENSSL_MD5} ${OPENSSL_URL} "${OPENSSL_SOURCES_DIR}")
7 13
8 if (NOT EXISTS "${OPENSSL_SOURCES_DIR}/include/PATCHED") 14 if (NOT EXISTS "${OPENSSL_SOURCES_DIR}/include/PATCHED")
9 if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") 15 if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
10 message("Patching the symbolic links") 16 message("Patching the symbolic links")
11 # Patch the symbolic links by copying the files 17 # Patch the symbolic links by copying the files
186 PROPERTIES COMPILE_DEFINITIONS 192 PROPERTIES COMPILE_DEFINITIONS
187 "OPENSSL_SYSNAME_WIN32;SO_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN") 193 "OPENSSL_SYSNAME_WIN32;SO_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN")
188 194
189 elseif ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") 195 elseif ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
190 execute_process( 196 execute_process(
191 COMMAND patch -N ui_openssl.c ${ORTHANC_ROOT}/Resources/Patches/openssl-lsb.diff 197 COMMAND ${PATCH_EXECUTABLE} -N ui_openssl.c ${ORTHANC_ROOT}/Resources/Patches/openssl-lsb.diff
192 WORKING_DIRECTORY ${OPENSSL_SOURCES_DIR}/crypto/ui 198 WORKING_DIRECTORY ${OPENSSL_SOURCES_DIR}/crypto/ui
199 RESULT_VARIABLE Failure
193 ) 200 )
194 201
202 if (Failure AND FirstRun)
203 message(FATAL_ERROR "Error while patching a file")
204 endif()
195 endif() 205 endif()
196 206
197 #add_library(OpenSSL STATIC ${OPENSSL_SOURCES}) 207 #add_library(OpenSSL STATIC ${OPENSSL_SOURCES})
198 #link_libraries(OpenSSL) 208 #link_libraries(OpenSSL)
199 209