early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,29 @@
From 02ba907908ccf5ed0d40a2251272b67cb05c23ea Mon Sep 17 00:00:00 2001
From: Francisco Facioni <fran6co@gmail.com>
Date: Sat, 31 Jul 2021 22:30:45 +0100
Subject: [PATCH] Missing symbols in the export
---
src/libqhull_r/qhull_r-exports.def | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/libqhull_r/qhull_r-exports.def b/src/libqhull_r/qhull_r-exports.def
index 4c5e17c..b789673 100644
--- a/src/libqhull_r/qhull_r-exports.def
+++ b/src/libqhull_r/qhull_r-exports.def
@@ -183,6 +183,7 @@ qh_maxouter
qh_maxsimplex
qh_maydropneighbor
qh_memalloc
+qh_memcheck
qh_memfree
qh_memfreeshort
qh_meminit
@@ -351,6 +352,7 @@ qh_setdelnth
qh_setdelnthsorted
qh_setdelsorted
qh_setduplicate
+qh_setendpointer
qh_setequal
qh_setequal_except
qh_setequal_skip

View File

@@ -0,0 +1,21 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f50b187..30109b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -344,7 +344,7 @@ set(qhull_SHAREDP qhull_p) # libqhull and qhull_p are deprecated, use qhull_r i
set(qhull_TARGETS_APPLICATIONS qhull rbox qconvex qdelaunay qvoronoi qhalf)
set(qhull_TARGETS_STATIC ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICR})
-set(qhull_TARGETS_SHARED ${qhull_SHAREDR})
+set(qhull_TARGETS_SHARED ${qhull_CPP} ${qhull_SHAREDR})
set(
qhull_TARGETS_TEST # Unused
@@ -474,7 +474,6 @@ set_target_properties(${qhull_CPP} PROPERTIES
if(NOT ${BUILD_STATIC_LIBS})
set_target_properties(${qhull_STATIC} PROPERTIES EXCLUDE_FROM_ALL TRUE)
set_target_properties(${qhull_STATICR} PROPERTIES EXCLUDE_FROM_ALL TRUE)
- set_target_properties(${qhull_CPP} PROPERTIES EXCLUDE_FROM_ALL TRUE)
endif()
if(NOT ${BUILD_SHARED_LIBS})
set_target_properties(${qhull_SHARED} PROPERTIES EXCLUDE_FROM_ALL TRUE)

67
externals/vcpkg/ports/qhull/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,67 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO qhull/qhull
REF 613debeaea72ee66626dace9ba1a2eff11b5d37d
SHA512 5b8ff9665ba73621a9859a6e86717b980b67f8d79d6c78cbf5672bce66aed671f7d64fcbec457bca79eef2e17e105f136017afdf442bb430b9f4a059d7cb93c3
HEAD_REF master
PATCHES
include-qhullcpp-shared.patch
fix-missing-symbols.patch # upstream https://github.com/qhull/qhull/pull/93
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
)
vcpkg_cmake_install()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/share/man"
"${CURRENT_PACKAGES_DIR}/share/doc"
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share/man"
"${CURRENT_PACKAGES_DIR}/debug/share/doc"
)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Qhull)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(WRITE "${CURRENT_PACKAGES_DIR}/share/qhull/QhullTargets-interface.cmake" [[
add_library(Qhull::qhull_r IMPORTED INTERFACE)
set_target_properties(Qhull::qhull_r PROPERTIES INTERFACE_LINK_LIBRARIES Qhull::qhullstatic_r)
]])
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
set(active_basename "qhullstatic")
set(inactive_basename "qhull")
else()
set(active_basename "qhull")
set(inactive_basename "qhullstatic")
endif()
file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${inactive_basename}_r.pc")
file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${inactive_basename}.pc") # qhullstatic.pc in dynamic build
if(NOT DEFINED VCPKG_BUILD_TYPE)
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${inactive_basename}_rd.pc")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${active_basename}_rd.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${active_basename}_r.pc")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullstatic_d.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullstatic.pc")
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${inactive_basename}.pc") # qhullstatic.pc in dynamic build
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullcpp_d.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullcpp.pc")
endif()
vcpkg_fixup_pkgconfig()
vcpkg_copy_tools(TOOL_NAMES
qconvex
qdelaunay
qhalf
qhull
qvoronoi
rbox
AUTO_CLEAN
)
file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME usage)
file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

9
externals/vcpkg/ports/qhull/usage vendored Executable file
View File

@@ -0,0 +1,9 @@
The package qhull provides CMake targets:
# Reentrant C API
find_package(Qhull CONFIG REQUIRED)
target_link_libraries(main PRIVATE Qhull::qhull_r)
# C++ API
find_package(Qhull CONFIG REQUIRED)
target_link_libraries(main PRIVATE Qhull::qhullcpp)

18
externals/vcpkg/ports/qhull/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,18 @@
{
"name": "qhull",
"version": "8.0.2",
"port-version": 3,
"description": "computes the convex hull, Delaunay triangulation, Voronoi diagram",
"homepage": "https://github.com/qhull/qhull",
"license": null,
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}