1 |
bicatali 10/10/03 23:42:49 |
2 |
|
3 |
Modified: qhull-2010.1-cmake-install.patch |
4 |
Log: |
5 |
Error in previous patch, now installs all qhull headers to allow reverse dependencies to be compatible |
6 |
|
7 |
(Portage version: 2.2_rc88/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 media-libs/qhull/files/qhull-2010.1-cmake-install.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/qhull/files/qhull-2010.1-cmake-install.patch?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/qhull/files/qhull-2010.1-cmake-install.patch?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/qhull/files/qhull-2010.1-cmake-install.patch?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: qhull-2010.1-cmake-install.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/qhull/files/qhull-2010.1-cmake-install.patch,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- qhull-2010.1-cmake-install.patch 3 Oct 2010 21:55:52 -0000 1.1 |
23 |
+++ qhull-2010.1-cmake-install.patch 3 Oct 2010 23:42:49 -0000 1.2 |
24 |
@@ -1,6 +1,6 @@ |
25 |
diff -Nur qhull-2010.1.orig/CMakeLists.txt qhull-2010.1/CMakeLists.txt |
26 |
---- qhull-2010.1.orig/CMakeLists.txt 2010-01-10 00:07:32.000000000 +0000 |
27 |
-+++ qhull-2010.1/CMakeLists.txt 2010-10-03 22:16:50.000000000 +0100 |
28 |
+--- qhull-2010.1.orig/CMakeLists.txt 2010-10-03 23:04:04.000000000 +0100 |
29 |
++++ qhull-2010.1/CMakeLists.txt 2010-10-03 23:26:54.000000000 +0100 |
30 |
@@ -1,8 +1,44 @@ |
31 |
project(qhull) |
32 |
-cmake_minimum_required(VERSION 2.4) |
33 |
@@ -51,8 +51,8 @@ |
34 |
+install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR}) |
35 |
+endif (WITH_DOCS) |
36 |
diff -Nur qhull-2010.1.orig/src/CMakeLists.txt qhull-2010.1/src/CMakeLists.txt |
37 |
---- qhull-2010.1.orig/src/CMakeLists.txt 2010-01-10 00:07:32.000000000 +0000 |
38 |
-+++ qhull-2010.1/src/CMakeLists.txt 2010-10-03 22:21:34.000000000 +0100 |
39 |
+--- qhull-2010.1.orig/src/CMakeLists.txt 2010-10-03 23:04:04.000000000 +0100 |
40 |
++++ qhull-2010.1/src/CMakeLists.txt 2010-10-04 00:23:47.000000000 +0100 |
41 |
@@ -23,8 +23,25 @@ |
42 |
|
43 |
file(GLOB qhull_hdr *.h) |
44 |
@@ -95,4 +95,4 @@ |
45 |
+install(TARGETS qhull qhullcmd rbox qconvex qdelaunay qvoronoi qhalf |
46 |
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR} |
47 |
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}) |
48 |
-+install(FILES libqhull.h DESTINATION ${INCLUDE_INSTALL_DIR}) |
49 |
++install(FILES ${qhull_hdr} DESTINATION ${INCLUDE_INSTALL_DIR}/qhull) |