mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 05:39:40 +08:00
[qhull] Fix Mac support (#9651)
This commit is contained in:
parent
79d1c64870
commit
ecf83936b2
@ -1,4 +1,4 @@
|
||||
Source: qhull
|
||||
Version: 7.3.2-1
|
||||
Version: 7.3.2-2
|
||||
Homepage: https://github.com/qhull/qhull
|
||||
Description: computes the convex hull, Delaunay triangulation, Voronoi diagram
|
||||
|
37
ports/qhull/mac-fix.patch
Normal file
37
ports/qhull/mac-fix.patch
Normal file
@ -0,0 +1,37 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 07d3da2..14df8e9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -626,18 +626,18 @@ install(TARGETS ${qhull_TARGETS_INSTALL} EXPORT QhullTargets
|
||||
include(CMakePackageConfigHelpers)
|
||||
|
||||
write_basic_package_version_file(
|
||||
- "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullConfigVersion.cmake"
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/QhullExport/QhullConfigVersion.cmake"
|
||||
VERSION ${qhull_VERSION}
|
||||
COMPATIBILITY AnyNewerVersion
|
||||
)
|
||||
|
||||
export(EXPORT QhullTargets
|
||||
- FILE "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullTargets.cmake"
|
||||
+ FILE "${CMAKE_CURRENT_BINARY_DIR}/QhullExport/QhullTargets.cmake"
|
||||
NAMESPACE Qhull::
|
||||
)
|
||||
|
||||
configure_file(${PROJECT_SOURCE_DIR}/build/config.cmake.in
|
||||
- "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullConfig.cmake"
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/QhullExport/QhullConfig.cmake"
|
||||
@ONLY
|
||||
)
|
||||
|
||||
@@ -652,8 +652,8 @@ install(EXPORT QhullTargets
|
||||
)
|
||||
install(
|
||||
FILES
|
||||
- "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullConfig.cmake"
|
||||
- "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullConfigVersion.cmake"
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/QhullExport/QhullConfig.cmake"
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/QhullExport/QhullConfigVersion.cmake"
|
||||
DESTINATION
|
||||
${ConfigPackageLocation}
|
||||
COMPONENT
|
@ -6,7 +6,9 @@ vcpkg_from_github(
|
||||
REF v7.3.2 # Qhull 2019.1
|
||||
SHA512 aea2c70179de10f648aba960129a3b9a3fe309a0eb085bdb86f697e3d4b214570c241e88d4f0b4d2974137759ee7086452d0a3957c4b2a256708402fb3c9eb3d
|
||||
HEAD_REF master
|
||||
PATCHES uwp.patch
|
||||
PATCHES
|
||||
uwp.patch
|
||||
mac-fix.patch
|
||||
)
|
||||
if(${TARGET_TRIPLET} STREQUAL "x64-windows-static")
|
||||
# workaround for visual studio toolset regression LNK1201 (remove if solved)
|
||||
|
Loading…
Reference in New Issue
Block a user