aboutsummarylogtreecommitdiffstats
path: root/781e311.patch
diff options
context:
space:
mode:
authorJP-Ellis2017-02-26 16:55:54 +1100
committerJP-Ellis2017-02-26 21:06:11 +1100
commit56e101b5e8b1bf3bf5c72b5436940b18e78a681a (patch)
treeee235caae13d46b63630e99e133f45b391f39eeb /781e311.patch
parentfccefe5040b1ea1afce3a64a17d778fd4e9231b7 (diff)
downloadaur-56e101b5e8b1bf3bf5c72b5436940b18e78a681a.tar.gz
Consolidate patches
The patches are brought forward from upstream and fix various small issues with the installation through CMake. Signed-off-by: JP-Ellis <josh@jpellis.me>
Diffstat (limited to '781e311.patch')
-rw-r--r--781e311.patch21
1 files changed, 0 insertions, 21 deletions
diff --git a/781e311.patch b/781e311.patch
deleted file mode 100644
index 0e5bb33c9231..000000000000
--- a/781e311.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 781e31188326232df2e0b57b10da09395d4301a1 Mon Sep 17 00:00:00 2001
-From: Michele Selvaggi <michele.selvaggi@uclouvain.be>
-Date: Thu, 24 Nov 2016 10:52:50 +0100
-Subject: [PATCH] fixed typo in display cmake list
-
----
- display/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/delphes-3.4.0/display/CMakeLists.txt b/delphes-3.4.0/display/CMakeLists.txt
-index 43d208e..b3a9efd 100644
---- a/delphes-3.4.0/display/CMakeLists.txt
-+++ b/delphes-3.4.0/display/CMakeLists.txt
-@@ -15,6 +15,6 @@ add_library(display OBJECT ${sources} DisplayDict.cxx)
- # install pcms if they are created
- if (${ROOT_VERSION} GREATER 6)
- install(FILES
-- ${PROJECT_BINARY_DIR}/external/DisplayDict_rdict.pcm
-+ ${PROJECT_BINARY_DIR}/display/libDisplayDict_rdict.pcm
- DESTINATION lib)
- endif()