Mercurial > hg > orthanc

comparison OrthancFramework/Resources/CMake/LibP11Configuration.cmake @ 4052:9fa06bddaabe framework

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix p11
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 11 Jun 2020 12:21:45 +0200
parents d25f4c0fa160
children 304842a0d152
comparison
equal deleted inserted replaced
4051:c459f210f6ac 4052:9fa06bddaabe
1 if (STATIC_BUILD OR NOT USE_SYSTEM_LIBP11) 1 if (STATIC_BUILD OR NOT USE_SYSTEM_LIBP11)
2 if (NOT STATIC_BUILD AND USE_SYSTEM_OPENSSL)
3 message(FATAL_ERROR "If statically linking against libp11, one must also statically link against OpenSSL")
4 endif()
5
2 SET(LIBP11_SOURCES_DIR ${CMAKE_BINARY_DIR}/libp11-0.4.0) 6 SET(LIBP11_SOURCES_DIR ${CMAKE_BINARY_DIR}/libp11-0.4.0)
3 SET(LIBP11_URL "http://orthanc.osimis.io/ThirdPartyDownloads/libp11-0.4.0.tar.gz") 7 SET(LIBP11_URL "http://orthanc.osimis.io/ThirdPartyDownloads/libp11-0.4.0.tar.gz")
4 SET(LIBP11_MD5 "00b3e41db5be840d822bda12f3ab2ca7") 8 SET(LIBP11_MD5 "00b3e41db5be840d822bda12f3ab2ca7")
5 9
6 if (IS_DIRECTORY "${LIBP11_SOURCES_DIR}") 10 if (IS_DIRECTORY "${LIBP11_SOURCES_DIR}")
11 15
12 DownloadPackage(${LIBP11_MD5} ${LIBP11_URL} "${LIBP11_SOURCES_DIR}") 16 DownloadPackage(${LIBP11_MD5} ${LIBP11_URL} "${LIBP11_SOURCES_DIR}")
13 17
14 # Apply the patches 18 # Apply the patches
15 execute_process( 19 execute_process(
16 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Patches/libp11-0.4.0.patch 20 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${CMAKE_CURRENT_LIST_DIR}/../Patches/libp11-0.4.0.patch
17 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 21 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
18 RESULT_VARIABLE Failure 22 RESULT_VARIABLE Failure
19 ) 23 )
20 24
21 if (Failure AND FirstRun) 25 if (Failure AND FirstRun)
25 # This command MUST be after applying the patch 29 # This command MUST be after applying the patch
26 file(COPY 30 file(COPY
27 ${LIBP11_SOURCES_DIR}/src/engine.h 31 ${LIBP11_SOURCES_DIR}/src/engine.h
28 ${LIBP11_SOURCES_DIR}/src/libp11.h 32 ${LIBP11_SOURCES_DIR}/src/libp11.h
29 DESTINATION ${AUTOGENERATED_DIR}/libp11) 33 DESTINATION ${AUTOGENERATED_DIR}/libp11)
34
35 file(WRITE ${AUTOGENERATED_DIR}/libp11/config.h "")
30 36
31 set(LIBP11_SOURCES 37 set(LIBP11_SOURCES
32 #${LIBP11_SOURCES_DIR}/src/eng_front.c 38 #${LIBP11_SOURCES_DIR}/src/eng_front.c
33 ${LIBP11_SOURCES_DIR}/src/eng_back.c 39 ${LIBP11_SOURCES_DIR}/src/eng_back.c
34 ${LIBP11_SOURCES_DIR}/src/eng_parse.c 40 ${LIBP11_SOURCES_DIR}/src/eng_parse.c