Mercurial > hg > orthanc

changeset 2029:df9c1738d92e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author sjodogne
date Mon, 20 Jun 2016 14:07:48 +0200
parents d108412411e5 (current diff) 8c9426d0a3e2 (diff)
children a6e8e2251304
files
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/LibP11Configuration.cmake	Mon Jun 20 14:07:29 2016 +0200
+++ b/Resources/CMake/LibP11Configuration.cmake	Mon Jun 20 14:07:48 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