diff options
| author | Fabien Péan <fabien@pean.pro> | 2020-11-12 01:48:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-11 16:48:07 -0800 |
| commit | 4b222f8d2653603b74fa5086cf0b02a1963d3911 (patch) | |
| tree | 4cd4045ff485841645971227449f1a586f5d831a /ports/libigl/fix-dependency.patch | |
| parent | 54d35841b4657604e52636e485926ef535737b49 (diff) | |
| download | vcpkg-4b222f8d2653603b74fa5086cf0b02a1963d3911.tar.gz vcpkg-4b222f8d2653603b74fa5086cf0b02a1963d3911.zip | |
[libigl] Fix dynamic build and enable header-only mode (#14376)
* [libigl] Fix dynamic build and enable header-only mode
* Update portfile.cmake
Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com>
Diffstat (limited to 'ports/libigl/fix-dependency.patch')
| -rw-r--r-- | ports/libigl/fix-dependency.patch | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ports/libigl/fix-dependency.patch b/ports/libigl/fix-dependency.patch index fad85af0a..94ce7aea9 100644 --- a/ports/libigl/fix-dependency.patch +++ b/ports/libigl/fix-dependency.patch @@ -34,15 +34,17 @@ index d07bbb3..a33cefa 100644 igl_download_embree() set(EMBREE_TESTING_INTENSITY 0 CACHE STRING "") -@@ -315,8 +316,8 @@ if(LIBIGL_WITH_EMBREE) +@@ -315,8 +315,11 @@ if(LIBIGL_WITH_EMBREE) endif() compile_igl_module("embree") -- target_link_libraries(igl_embree ${IGL_SCOPE} embree) + target_link_libraries(igl_embree ${IGL_SCOPE} embree) - target_include_directories(igl_embree ${IGL_SCOPE} ${EMBREE_DIR}/include) -+ target_link_libraries(igl_embree ${IGL_SCOPE} ${EMBREE_LIBRARIES}) -+ target_include_directories(igl_embree ${IGL_SCOPE} ${EMBREE_INCLUDE_DIRS}) ++ if(LIBIGL_USE_STATIC_LIBRARY) ++ find_package(TBB CONFIG REQUIRED) ++ target_link_libraries(igl_embree ${IGL_SCOPE} TBB::tbb) target_compile_definitions(igl_embree ${IGL_SCOPE} -DEMBREE_STATIC_LIB) ++ endif() endif() @@ -358,11 +359,12 @@ if(LIBIGL_WITH_OPENGL) @@ -126,7 +128,8 @@ index d07bbb3..a33cefa 100644 compile_igl_module("xml") - target_link_libraries(igl_xml ${IGL_SCOPE} tinyxml2) + target_link_libraries(igl_xml ${IGL_SCOPE} tinyxml2::tinyxml2) - target_include_directories(igl_xml ${IGL_SCOPE} ${TINYXML2_DIR}) +- target_include_directories(igl_xml ${IGL_SCOPE} ${TINYXML2_DIR}) ++ endif() diff --git a/include/igl/opengl/glfw/imgui/ImGuiHelpers.h b/include/igl/opengl/glfw/imgui/ImGuiHelpers.h |