Mercurial > hg > orthanc

comparison Resources/CMake/LibP11Configuration.cmake @ 2027:8c9426d0a3e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 20 Jun 2016 13:50:26 +0200
parents d46746607ae0
children 0108ac01fc8e
comparison
equal deleted inserted replaced
2026:d46746607ae0 2027:8c9426d0a3e2
9 set(FirstRun ON) 9 set(FirstRun ON)
10 endif() 10 endif()
11 11
12 DownloadPackage(${LIBP11_MD5} ${LIBP11_URL} "${LIBP11_SOURCES_DIR}") 12 DownloadPackage(${LIBP11_MD5} ${LIBP11_URL} "${LIBP11_SOURCES_DIR}")
13 13
14 file(COPY 14 # Apply the patches
15 ${LIBP11_SOURCES_DIR}/src/engine.h
16 ${LIBP11_SOURCES_DIR}/src/libp11.h
17 DESTINATION ${AUTOGENERATED_DIR}/libp11)
18
19 execute_process( 15 execute_process(
20 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Patches/libp11-0.4.0.patch 16 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Patches/libp11-0.4.0.patch
21 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 17 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
22 RESULT_VARIABLE Failure 18 RESULT_VARIABLE Failure
23 ) 19 )
24 20
25 if (Failure AND FirstRun) 21 if (Failure AND FirstRun)
26 message(FATAL_ERROR "Error while patching libp11") 22 message(FATAL_ERROR "Error while patching libp11")
27 endif() 23 endif()
24
25 # This command MUST be after applying the patch
26 file(COPY
27 ${LIBP11_SOURCES_DIR}/src/engine.h
28 ${LIBP11_SOURCES_DIR}/src/libp11.h
29 DESTINATION ${AUTOGENERATED_DIR}/libp11)
28 30
29 set(LIBP11_SOURCES 31 set(LIBP11_SOURCES
30 #${LIBP11_SOURCES_DIR}/src/eng_front.c 32 #${LIBP11_SOURCES_DIR}/src/eng_front.c
31 ${LIBP11_SOURCES_DIR}/src/eng_back.c 33 ${LIBP11_SOURCES_DIR}/src/eng_back.c
32 ${LIBP11_SOURCES_DIR}/src/eng_parse.c 34 ${LIBP11_SOURCES_DIR}/src/eng_parse.c