qhull:first pisi rel

2020-05-31 01:50:07 +03:00
parent 974945c60f
commit 612ba38d06
5 changed files with 166 additions and 0 deletions
@@ -0,0 +1,42 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 09aa249..f1f4b50 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -353,7 +353,7 @@ endif()
+ 
+ set(
+     qhull_TARGETS_INSTALL
+-        ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICR} ${qhull_SHAREDR}
+        ${qhull_CPP} ${qhull_SHAREDR}
+         qhull rbox qconvex qdelaunay qvoronoi qhalf
+         ${qhull_SHARED} ${qhull_SHAREDP}  # Deprecated, use qhull_r instead
+ )
+@@ -485,22 +485,22 @@ set(qvoronoi_SOURCES    src/qvoronoi/qvoronoi.c)
+ set(qhalf_SOURCES       src/qhalf/qhalf.c)
+ 
+ add_executable(qhull ${qhull_SOURCES})
+-target_link_libraries(qhull ${qhull_STATICR})
+target_link_libraries(qhull ${qhull_SHAREDR})
+ 
+ add_executable(rbox ${rbox_SOURCES})
+-target_link_libraries(rbox ${qhull_STATIC})
+target_link_libraries(rbox ${qhull_SHARED})
+ 
+ add_executable(qconvex ${qconvex_SOURCES})
+-target_link_libraries(qconvex ${qhull_STATIC})
+target_link_libraries(qconvex ${qhull_SHARED})
+ 
+ add_executable(qdelaunay ${qdelaunay_SOURCES})
+-target_link_libraries(qdelaunay ${qhull_STATIC})
+target_link_libraries(qdelaunay ${qhull_SHARED})
+ 
+ add_executable(qvoronoi ${qvoronoi_SOURCES})
+-target_link_libraries(qvoronoi ${qhull_STATIC})
+target_link_libraries(qvoronoi ${qhull_SHARED})
+ 
+ add_executable(qhalf ${qhalf_SOURCES})
+-target_link_libraries(qhalf ${qhull_STATIC})
+target_link_libraries(qhalf ${qhull_SHARED})
+ 
+ # ---------------------------------------
+ # Define options for linking to qhull_SHAREDR or qhull_SHARED
@@ -0,0 +1,25 @@
+From a5d0e644ee886251cec5d05948502517e154a9e1 Mon Sep 17 00:00:00 2001
+From: "Joshua A. Anderson" <joaander@umich.edu>
+Date: Fri, 20 Sep 2019 09:36:51 -0400
+Subject: [PATCH] Build libqhullcpp with position independent code
+
+This allows libqhullcpp.a to be linked into shared libraries (i.e.
+python modules).
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9d44056..f4b6b37 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -466,7 +466,8 @@ endif(UNIX)
+ 
+ add_library(${qhull_CPP} STATIC ${libqhullcpp_SOURCES})
+ set_target_properties(${qhull_CPP} PROPERTIES
+-    VERSION ${qhull_VERSION})
+    VERSION ${qhull_VERSION}
+    POSITION_INDEPENDENT_CODE "TRUE")
+ 
+ # ---------------------------------------
+ # Define qhull executables linked to qhullstatic library