Attachment 229602 Details for Bug 259941 – git_diff_patch_src_qhull_CMakeLists.txt.diff

[patch] git_diff_patch_src_qhull_CMakeLists.txt.diff

git_diff_patch_src_qhull_CMakeLists.txt.diff (text/plain), 1.21 KB, created by alt2600 on 2021-11-20 03:46:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: alt2600

Created: 2021-11-20 03:46:49 UTC

Size: 1.21 KB

patch

obsolete

>diff --git a/cad/PrusaSlicer/files/patch-src_qhull_CMakeLists.txt b/cad/PrusaSlicer/files/patch-src_qhull_CMakeLists.txt
>new file mode 100644
>index 000000000000..ce0b95dc9110
>--- /dev/null
>+++ b/cad/PrusaSlicer/files/patch-src_qhull_CMakeLists.txt
>@@ -0,0 +1,29 @@
>+--- src/qhull/CMakeLists.txt.orig	2021-11-19 21:23:46.166100000 -0500
>++++ src/qhull/CMakeLists.txt	2021-11-19 21:27:12.170235000 -0500
>+@@ -14,19 +14,8 @@
>+ 
>+ add_library(qhull INTERFACE)
>+ 
>+-if(Qhull_FOUND)
>++#force use of bundled qhull#else(Qhull_FOUND)
>+ 
>+-message(STATUS "Using qhull from system.")
>+-if(SLIC3R_STATIC)
>+-    slic3r_remap_configs("Qhull::qhullcpp;Qhull::qhullstatic_r" RelWithDebInfo Release)
>+-    target_link_libraries(qhull INTERFACE Qhull::qhullcpp Qhull::qhullstatic_r)
>+-else()
>+-    slic3r_remap_configs("Qhull::qhullcpp;Qhull::qhull_r" RelWithDebInfo Release)
>+-    target_link_libraries(qhull INTERFACE Qhull::qhullcpp Qhull::qhull_r)
>+-endif()
>+-
>+-else(Qhull_FOUND)
>+-
>+ project(qhull)
>+ cmake_minimum_required(VERSION 2.6)
>+ 
>+@@ -144,4 +133,4 @@
>+ target_include_directories(${qhull_STATIC} BEFORE PUBLIC ${LIBDIR}/qhull/src)
>+ target_link_libraries(qhull INTERFACE ${qhull_STATIC})
>+ 
>+-endif()
>++#force use of bundled qhull##endif()

Actions: View | Diff

Attachments on bug 259941: 229600 | 229601 | 229602 | 229603