hdkv/yuzu
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

early-access version 2853

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

28
externals/vcpkg/ports/libigl/fix-config.patch vendored Executable file
View File

@@ -0,0 +1,28 @@
diff --git a/cmake/libigl-config.cmake.in b/cmake/libigl-config.cmake.in
index 21aa2468..0aa6d8a0 100644
--- a/cmake/libigl-config.cmake.in
+++ b/cmake/libigl-config.cmake.in
@@ -27,5 +27,23 @@ if (TARGET igl::common)
endif()
endif()
+ include(CMakeFindDependencyMacro)
+if (TARGET igl::embree)
+ find_dependency(embree 3 CONFIG REQUIRED)
+endif()
+if (TARGET igl::xml)
+ find_dependency(tinyxml2 CONFIG REQUIRED)
+endif()
+if (TARGET igl::opengl)
+ find_dependency(OpenGL REQUIRED)
+ find_dependency(glad CONFIG REQUIRED)
+ if (TARGET igl::opengl_glfw)
+ find_dependency(glfw3 CONFIG REQUIRED)
+ if (TARGET igl::opengl_glfw_imgui)
+ find_dependency(imgui CONFIG REQUIRED)
+ endif()
+ endif()
+endif()
+
check_required_components(libigl)

213
externals/vcpkg/ports/libigl/fix-dependency.patch vendored Executable file
View File

@@ -0,0 +1,213 @@
diff --git a/cmake/LibiglWindows.cmake b/cmake/LibiglWindows.cmake
index b98aa55..46c68a7 100644
--- a/cmake/LibiglWindows.cmake
+++ b/cmake/LibiglWindows.cmake
@@ -1,4 +1,4 @@
-if(MSVC)
+if(0)
option(IGL_STATIC_RUNTIME "Use libigl with the static MSVC runtime." OFF)
if(IGL_STATIC_RUNTIME)
message(STATUS "MSVC -> forcing use of statically-linked runtime.")
diff --git a/cmake/libigl.cmake b/cmake/libigl.cmake
index 6de1b41..46ecbf0 100644
--- a/cmake/libigl.cmake
+++ b/cmake/libigl.cmake
@@ -107,7 +107,8 @@ if(HUNTER_ENABLED)
endif()
# Eigen
-if(NOT TARGET Eigen3::Eigen)
+find_package(Eigen3 CONFIG REQUIRED)
+if(0)
igl_download_eigen()
add_library(igl_eigen INTERFACE)
target_include_directories(igl_eigen SYSTEM INTERFACE
@@ -296,9 +297,9 @@ endif()
################################################################################
### Compile the embree part ###
if(LIBIGL_WITH_EMBREE)
- set(EMBREE_DIR "${LIBIGL_EXTERNAL}/embree")
+ find_package(embree 3 CONFIG REQUIRED)
- if(NOT TARGET embree)
+ if(0)
igl_download_embree()
# Note: On macOS, building embree as a static lib can only be done with a single ISA target.
@@ -317,8 +318,11 @@ if(LIBIGL_WITH_EMBREE)
compile_igl_module("embree")
target_link_libraries(igl_embree ${IGL_SCOPE} embree)
- target_include_directories(igl_embree ${IGL_SCOPE} ${EMBREE_DIR}/include)
- target_compile_definitions(igl_embree ${IGL_SCOPE} -DEMBREE_STATIC_LIB)
+ 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()
################################################################################
@@ -359,11 +363,12 @@ if(LIBIGL_WITH_OPENGL)
endif()
# glad module
- if(NOT TARGET glad)
+ find_package(glad CONFIG REQUIRED)
+ if(0)
igl_download_glad()
add_subdirectory(${LIBIGL_EXTERNAL}/glad glad)
endif()
- target_link_libraries(igl_opengl ${IGL_SCOPE} glad)
+ target_link_libraries(igl_opengl ${IGL_SCOPE} glad::glad)
endif()
################################################################################
@@ -372,7 +377,8 @@ if(LIBIGL_WITH_OPENGL_GLFW)
if(TARGET igl::opengl)
# GLFW module
compile_igl_module("opengl/glfw")
- if(NOT TARGET glfw)
+ find_package(glfw3 CONFIG REQUIRED)
+ if(0)
igl_download_glfw()
option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" OFF)
option(GLFW_BUILD_TESTS "Build the GLFW test programs" OFF)
@@ -395,17 +401,19 @@ if(LIBIGL_WITH_OPENGL_GLFW_IMGUI)
if(TARGET igl::opengl_glfw)
# ImGui module
compile_igl_module("opengl/glfw/imgui")
- if(NOT TARGET imgui)
+ find_package(imgui CONFIG REQUIRED)
+ if(0)
igl_download_imgui()
add_subdirectory(${LIBIGL_EXTERNAL}/libigl-imgui imgui)
endif()
- if(NOT TARGET imguizmo)
+ find_package(imguizmo CONFIG REQUIRED)
+ if(0)
igl_download_imguizmo()
add_library(imguizmo ${LIBIGL_EXTERNAL}/imguizmo/ImGuizmo.cpp ${LIBIGL_EXTERNAL}/imguizmo/ImGuizmo.h)
target_compile_features(imguizmo PUBLIC cxx_std_11)
target_link_libraries(imguizmo PUBLIC imgui)
endif()
- target_link_libraries(igl_opengl_glfw_imgui ${IGL_SCOPE} igl_opengl_glfw imgui imguizmo)
+ target_link_libraries(igl_opengl_glfw_imgui ${IGL_SCOPE} igl_opengl_glfw imgui::imgui imguizmo::imguizmo)
endif()
endif()
@@ -415,12 +423,22 @@ if(LIBIGL_WITH_PNG)
# png/ module is anomalous because it also depends on opengl it really should
# be moved into the opengl/ directory and namespace ...
if(TARGET igl_opengl)
- if(NOT TARGET stb_image)
+ find_path(stb_include_dir stb.h)
+ find_package(opengl REQUIRED)
+ find_package(libpng CONFIG REQUIRED)
+ find_package(glad CONFIG REQUIRED)
+ if (BUILD_SHARED_LIBS)
+ set(libpng_LIBRARIES png)
+ else()
+ set(libpng_LIBRARIES png_static)
+ endif()
+ if(0)
igl_download_stb()
add_subdirectory(${LIBIGL_EXTERNAL}/stb stb_image)
endif()
compile_igl_module("png" "")
- target_link_libraries(igl_png ${IGL_SCOPE} igl_stb_image igl_opengl)
+ target_include_directories(igl_png INTERFACE ${stb_include_dir})
+ target_link_libraries(igl_png ${IGL_SCOPE} OpenGL::GL ${libpng_LIBRARIES} glad::glad)
endif()
endif()
@@ -468,7 +486,8 @@ endif()
### Compile the xml part ###
if(LIBIGL_WITH_XML)
set(TINYXML2_DIR "${LIBIGL_EXTERNAL}/tinyxml2")
- if(NOT TARGET tinyxml2)
+ find_package(tinyxml2 CONFIG REQUIRED)
+ if(0)
igl_download_tinyxml2()
add_library(tinyxml2 STATIC ${TINYXML2_DIR}/tinyxml2.cpp ${TINYXML2_DIR}/tinyxml2.h)
target_include_directories(tinyxml2 PUBLIC ${TINYXML2_DIR})
@@ -478,8 +497,7 @@ if(LIBIGL_WITH_XML)
SOVERSION "3")
endif()
compile_igl_module("xml")
- target_link_libraries(igl_xml ${IGL_SCOPE} tinyxml2)
- target_include_directories(igl_xml ${IGL_SCOPE} ${TINYXML2_DIR})
+ target_link_libraries(igl_xml ${IGL_SCOPE} tinyxml2::tinyxml2)
endif()
################################################################################
diff --git a/include/igl/opengl/glfw/imgui/ImGuiHelpers.h b/include/igl/opengl/glfw/imgui/ImGuiHelpers.h
index 0663390..f35f097 100644
--- a/include/igl/opengl/glfw/imgui/ImGuiHelpers.h
+++ b/include/igl/opengl/glfw/imgui/ImGuiHelpers.h
@@ -10,7 +10,7 @@
////////////////////////////////////////////////////////////////////////////////
#include "ImGuiTraits.h"
-#include <imgui/imgui.h>
+#include <imgui.h>
#include <vector>
#include <string>
#include <algorithm>
diff --git a/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp b/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp
index c91c1cc..0836142 100644
--- a/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp
+++ b/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp
@@ -9,7 +9,7 @@
#include "ImGuiMenu.h"
#include "ImGuiHelpers.h"
#include <igl/project.h>
-#include <imgui/imgui.h>
+#include <imgui.h>
#include <imgui_impl_glfw.h>
#include <imgui_impl_opengl3.h>
#include <imgui_fonts_droid_sans.h>
diff --git a/include/igl/opengl/glfw/imgui/ImGuiTraits.h b/include/igl/opengl/glfw/imgui/ImGuiTraits.h
index 7dae22a..e6911c5 100644
--- a/include/igl/opengl/glfw/imgui/ImGuiTraits.h
+++ b/include/igl/opengl/glfw/imgui/ImGuiTraits.h
@@ -8,7 +8,7 @@
#ifndef IGL_OPENGL_GLFW_IMGUI_IMGUITRAITS_H
#define IGL_OPENGL_GLFW_IMGUI_IMGUITRAITS_H
-#include <imgui/imgui.h>
+#include <imgui.h>
// Extend ImGui by populating its namespace directly
namespace ImGui
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2410c19..a7659a3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -15,12 +15,11 @@ igl_download_test_data()
set(IGL_TEST_DATA ${LIBIGL_EXTERNAL}/../tests/data)
### Download Catch2 unit test framework
-igl_download_catch2()
+find_package(Catch2 CONFIG REQUIRED)
list(APPEND CMAKE_MODULE_PATH ${LIBIGL_EXTERNAL}/catch2/contrib)
# Add catch2
-add_subdirectory(${LIBIGL_EXTERNAL}/catch2 catch2)
# Create test executable
diff --git a/tutorial/106_ViewerMenu/main.cpp b/tutorial/106_ViewerMenu/main.cpp
index a8e49d6..c7946f9 100644
--- a/tutorial/106_ViewerMenu/main.cpp
+++ b/tutorial/106_ViewerMenu/main.cpp
@@ -2,7 +2,7 @@
#include <igl/opengl/glfw/Viewer.h>
#include <igl/opengl/glfw/imgui/ImGuiMenu.h>
#include <igl/opengl/glfw/imgui/ImGuiHelpers.h>
-#include <imgui/imgui.h>
+#include <imgui.h>
#include <iostream>
#include "tutorial_shared_path.h"

90
externals/vcpkg/ports/libigl/install-extra-headers.patch vendored Executable file
View File

@@ -0,0 +1,90 @@
diff --git a/cmake/libigl.cmake b/cmake/libigl.cmake
index a33cefa..0014375 100644
--- a/cmake/libigl.cmake
+++ b/cmake/libigl.cmake
@@ -560,6 +560,85 @@ export(
# Install headers for core library
install_dir_files(core)
install_dir_files(copyleft)
+
+if (LIBIGL_WITH_EMBREE)
+ install_dir_files(embree)
+# if(NOT LIBIGL_USE_STATIC_LIBRARY)
+ install(TARGETS igl_embree EXPORT igl-export)
+ export(TARGETS igl_embree
+ APPEND FILE libigl-export.cmake EXPORT_LINK_INTERFACE_LIBRARIES
+ )
+# endif()
+endif()
+
+if (LIBIGL_WITH_CGAL)
+ install_dir_files(copyleft/cgal)
+endif()
+
+if (LIBIGL_WITH_COMISO)
+ install_dir_files(copyleft/comiso)
+endif()
+
+if (LIBIGL_WITH_CORK)
+ install_dir_files(copyleft/cork)
+endif()
+
+if (LIBIGL_WITH_TETGEN)
+ install_dir_files(copyleft/tetgen)
+endif()
+
+if (LIBIGL_WITH_OPENGL OR LIBIGL_WITH_OPENGL_GLFW OR LIBIGL_WITH_OPENGL_GLFW_IMGUI)
+ install_dir_files(copyleft/opengl2)
+ install_dir_files(opengl)
+# if(NOT LIBIGL_USE_STATIC_LIBRARY)
+ install(TARGETS igl_opengl EXPORT igl-export)
+ export(TARGETS igl_opengl
+ APPEND FILE libigl-export.cmake EXPORT_LINK_INTERFACE_LIBRARIES
+ )
+# endif()
+endif()
+
+if (LIBIGL_WITH_OPENGL_GLFW OR LIBIGL_WITH_OPENGL_GLFW_IMGUI)
+ install_dir_files(opengl/glfw)
+# if(NOT LIBIGL_USE_STATIC_LIBRARY)
+ install(TARGETS igl_opengl_glfw EXPORT igl-export)
+ export(TARGETS igl_opengl_glfw
+ APPEND FILE libigl-export.cmake EXPORT_LINK_INTERFACE_LIBRARIES
+ )
+# endif()
+endif()
+
+if (LIBIGL_WITH_OPENGL_GLFW_IMGUI)
+ install_dir_files(opengl/glfw/imgui)
+# if(NOT LIBIGL_USE_STATIC_LIBRARY)
+ install(TARGETS igl_opengl_glfw_imgui EXPORT igl-export)
+ export(TARGETS igl_opengl_glfw_imgui
+ APPEND FILE libigl-export.cmake EXPORT_LINK_INTERFACE_LIBRARIES
+ )
+# endif()
+endif()
+
+if (LIBIGL_WITH_PNG)
+ install_dir_files(png)
+endif()
+
+if (LIBIGL_WITH_PREDICATES)
+ install_dir_files(predicates)
+endif()
+
+if (LIBIGL_WITH_TRIANGLE)
+ install_dir_files(triangle)
+endif()
+
+if (LIBIGL_WITH_XML)
+ install_dir_files(xml)
+# if(NOT LIBIGL_USE_STATIC_LIBRARY)
+ install(TARGETS igl_xml EXPORT igl-export)
+ export(TARGETS igl_xml
+ APPEND FILE libigl-export.cmake EXPORT_LINK_INTERFACE_LIBRARIES
+ )
+# endif()
+endif()
# Write package configuration file
configure_package_config_file(

52
externals/vcpkg/ports/libigl/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,52 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libigl/libigl
REF e60423e28c86b6aa2a3f6eb0112e8fd881f96777 #2.3.0
SHA512 3fecb710825e58745c1d67eab694ee365a5b86151a5a1ca3758c1000c124059d38dbc78e8c6e941be6d85a716f928ed8fea42bb6007b8e24da0123332c2c96da
HEAD_REF master
PATCHES
fix-dependency.patch
install-extra-headers.patch
fix-config.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
embree LIBIGL_WITH_EMBREE
opengl LIBIGL_WITH_OPENGL
glfw LIBIGL_WITH_OPENGL_GLFW
imgui LIBIGL_WITH_OPENGL_GLFW_IMGUI
#png LIBIGL_WITH_PNG # Disable this feature due to issue https://github.com/libigl/libigl/issues/1199
xml LIBIGL_WITH_XML
#python LIBIGL_WITH_PYTHON # Python binding are in the process of being redone.
cgal LIBIGL_WITH_CGAL
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
OPTIONS ${FEATURE_OPTIONS}
-DLIBIGL_BUILD_PYTHON=OFF
-DLIBIGL_EXPORT_TARGETS=ON
-DLIBIGL_USE_STATIC_LIBRARY=OFF # Header-only mode
-DLIBIGL_WITH_COMISO=OFF
-DLIBIGL_WITH_TETGEN=OFF
-DLIBIGL_WITH_TRIANGLE=OFF
-DLIBIGL_WITH_PREDICATES=OFF
-DLIBIGL_BUILD_TUTORIALS=OFF
-DLIBIGL_WITH_PNG=OFF
-DLIBIGL_BUILD_TESTS=OFF
-DPYTHON_EXECUTABLE=${PYTHON2}
MAYBE_UNUSED_VARIABLES
PYTHON_EXECUTABLE
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH share/libigl/cmake)
vcpkg_copy_pdbs()
# libigl is a header-only library.
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
file(INSTALL "${SOURCE_PATH}/LICENSE.GPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

82
externals/vcpkg/ports/libigl/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,82 @@
{
"name": "libigl",
"version": "2.3.0",
"port-version": 2,
"description": "libigl is a simple C++ geometry processing library. We have a wide functionality including construction of sparse discrete differential geometry operators and finite-elements matrices such as the cotangent Laplacian and diagonalized mass matrix, simple facet and edge-based topology data structures, mesh-viewing utilities for OpenGL and GLSL, and many core functions for matrix manipulation which make Eigen feel a lot more like MATLAB.",
"homepage": "https://github.com/libigl/libigl",
"license": "GPL-3.0-only",
"supports": "!(arm | uwp)",
"dependencies": [
"eigen3",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
"cgal": {
"description": "Build with cgal",
"dependencies": [
"cgal"
]
},
"embree": {
"description": "Build with embree",
"dependencies": [
"embree3"
]
},
"glfw": {
"description": "Build with glfw",
"dependencies": [
"glfw3",
{
"name": "libigl",
"default-features": false,
"features": [
"opengl"
]
}
]
},
"imgui": {
"description": "Build with imgui",
"dependencies": [
{
"name": "imgui",
"default-features": false,
"features": [
"glfw-binding",
"libigl-imgui",
"opengl3-binding"
]
},
"imguizmo",
{
"name": "libigl",
"default-features": false,
"features": [
"glfw"
]
}
]
},
"opengl": {
"description": "Build with opengl",
"dependencies": [
"glad",
"opengl"
]
},
"xml": {
"description": "Build with libxml",
"dependencies": [
"tinyxml2"
]
}
}
}