Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/qhull/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: qhull
Version: 8.0.0
Version: 8.0.2
Homepage: https://github.com/qhull/qhull
Description: computes the convex hull, Delaunay triangulation, Voronoi diagram
21 changes: 21 additions & 0 deletions ports/qhull/include-qhullcpp-shared.patch
Original file line number Diff line number Diff line change
@@ -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)
13 changes: 0 additions & 13 deletions ports/qhull/mac-fix.patch

This file was deleted.

89 changes: 39 additions & 50 deletions ports/qhull/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,68 +1,57 @@
include(vcpkg_common_functions)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO qhull/qhull
REF v8.0.0 # Qhull 2020.1
SHA512 b6ac17193b7c8a4ffb5f5a64cc057d1d5123f155f1c4fcd290fe1768356fef5c58d511707bba8c4814ca754bc6cdf5c370af23953d00c24a5ec28b8a1e489d31
REF 613debeaea72ee66626dace9ba1a2eff11b5d37d
SHA512 5b8ff9665ba73621a9859a6e86717b980b67f8d79d6c78cbf5672bce66aed671f7d64fcbec457bca79eef2e17e105f136017afdf442bb430b9f4a059d7cb93c3
HEAD_REF master
PATCHES
mac-fix.patch
)
if(${TARGET_TRIPLET} STREQUAL "x64-windows-static")
# workaround for visual studio toolset regression LNK1201 (remove if solved)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DINCLUDE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/include
-DMAN_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/doc/qhull
-DDOC_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/doc/qhull
OPTIONS_RELEASE
-DLIB_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib
OPTIONS_DEBUG
-DLIB_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib
PATCHES include-qhullcpp-shared.patch
)
else()

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DINCLUDE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/include
-DMAN_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/doc/qhull
-DDOC_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/doc/qhull
OPTIONS_RELEASE
-DLIB_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib
OPTIONS_DEBUG
-DLIB_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
)
endif()

vcpkg_install_cmake()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Qhull)

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(GLOB_RECURSE HTMFILES ${CURRENT_PACKAGES_DIR}/include/*.htm)
file(REMOVE ${HTMFILES})
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc)

file(GLOB EXEFILES_RELEASE ${CURRENT_PACKAGES_DIR}/bin/*.exe)
file(GLOB EXEFILES_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
file(COPY ${EXEFILES_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qhull)
if(EXEFILES_RELEASE OR EXEFILES_DEBUG)
file(REMOVE ${EXEFILES_RELEASE} ${EXEFILES_DEBUG})
endif()
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_fixup_cmake_targets(CONFIG_PATH lib/cmake/Qhull)
file(REMOVE
${CURRENT_PACKAGES_DIR}/lib/pkgconfig/qhullstatic.pc
${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullstatic_d.pc
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qhull.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qhull_d.lib)
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qhull_p.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qhull_pd.lib)
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qhull_r.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qhull_rd.lib)
file(REMOVE
${CURRENT_PACKAGES_DIR}/lib/pkgconfig/qhull_r.pc
${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhull_rd.pc
)
else()
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qhullcpp.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qhullcpp_d.lib)
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qhullstatic.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qhullstatic_d.lib)
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qhullstatic_r.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qhullstatic_rd.lib)
file(REMOVE
${CURRENT_PACKAGES_DIR}/lib/pkgconfig/qhullstatic_r.pc
${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullstatic_rd.pc
)
endif()
vcpkg_fixup_pkgconfig()

vcpkg_copy_tools(TOOL_NAMES
qconvex
qdelaunay
qhalf
qhull
qvoronoi
rbox
AUTO_CLEAN
)

file(COPY ${SOURCE_PATH}/README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/qhull)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/qhull/README.txt ${CURRENT_PACKAGES_DIR}/share/qhull/copyright)
file(INSTALL ${SOURCE_PATH}/README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)