# HG changeset patch # User Sebastien Jodogne # Date 1466423426 -7200 # Node ID 8c9426d0a3e29881b0b036d934ef57ca0fa7d286 # Parent d46746607ae012fe683d8a12bd12ea25a26eadae fix diff -r d46746607ae0 -r 8c9426d0a3e2 Resources/CMake/LibP11Configuration.cmake --- a/Resources/CMake/LibP11Configuration.cmake Mon Jun 20 13:48:36 2016 +0200 +++ b/Resources/CMake/LibP11Configuration.cmake Mon Jun 20 13:50:26 2016 +0200 @@ -11,11 +11,7 @@ DownloadPackage(${LIBP11_MD5} ${LIBP11_URL} "${LIBP11_SOURCES_DIR}") - file(COPY - ${LIBP11_SOURCES_DIR}/src/engine.h - ${LIBP11_SOURCES_DIR}/src/libp11.h - DESTINATION ${AUTOGENERATED_DIR}/libp11) - + # Apply the patches execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Patches/libp11-0.4.0.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} @@ -26,6 +22,12 @@ message(FATAL_ERROR "Error while patching libp11") endif() + # This command MUST be after applying the patch + file(COPY + ${LIBP11_SOURCES_DIR}/src/engine.h + ${LIBP11_SOURCES_DIR}/src/libp11.h + DESTINATION ${AUTOGENERATED_DIR}/libp11) + set(LIBP11_SOURCES #${LIBP11_SOURCES_DIR}/src/eng_front.c ${LIBP11_SOURCES_DIR}/src/eng_back.c