[imguizmo] Remove keyword unofficial of imguizmo's usage (#40678)

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
This commit is contained in:
Lily Wang 2024-09-03 12:26:57 -07:00 committed by GitHub
parent 27b79a47b7
commit 2d2b7d172d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 23 additions and 12 deletions

View File

@ -31,7 +31,7 @@ target_sources(
install( install(
TARGETS ${PROJECT_NAME} TARGETS ${PROJECT_NAME}
EXPORT unofficial-${PROJECT_NAME}-target EXPORT ${PROJECT_NAME}-target
ARCHIVE DESTINATION lib ARCHIVE DESTINATION lib
ARCHIVE DESTINATION lib ARCHIVE DESTINATION lib
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
@ -51,8 +51,8 @@ if (NOT IMGUIZMO_SKIP_HEADERS)
endif() endif()
install( install(
EXPORT unofficial-${PROJECT_NAME}-target EXPORT ${PROJECT_NAME}-target
NAMESPACE unofficial::${PROJECT_NAME}:: NAMESPACE ${PROJECT_NAME}::
FILE unofficial-${PROJECT_NAME}-config.cmake FILE ${PROJECT_NAME}-config.cmake
DESTINATION share/unofficial-${PROJECT_NAME} DESTINATION share/${PROJECT_NAME}
) )

View File

@ -19,6 +19,6 @@ vcpkg_cmake_configure(
vcpkg_cmake_install() vcpkg_cmake_install()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT}) vcpkg_cmake_config_fixup(PACKAGE_NAME ${PORT} CONFIG_PATH share/${PORT})
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

View File

@ -1,6 +1,7 @@
{ {
"name": "imguizmo", "name": "imguizmo",
"version-date": "2024-05-29", "version-date": "2024-05-29",
"port-version": 1,
"description": "Immediate mode 3D gizmo for scene editing and other controls based on Dear ImGui", "description": "Immediate mode 3D gizmo for scene editing and other controls based on Dear ImGui",
"homepage": "https://github.com/CedricGuillemet/ImGuizmo", "homepage": "https://github.com/CedricGuillemet/ImGuizmo",
"license": "MIT", "license": "MIT",

View File

@ -78,7 +78,7 @@ index d7ffb9d..6152756 100644
-include(imguizmo) -include(imguizmo)
-include(libigl_imgui_fonts) -include(libigl_imgui_fonts)
+find_package(imgui CONFIG REQUIRED) +find_package(imgui CONFIG REQUIRED)
+find_package(unofficial-imguizmo CONFIG REQUIRED) +find_package(imguizmo CONFIG REQUIRED)
igl_include(glfw) igl_include(glfw)
target_link_libraries(igl_imgui ${IGL_SCOPE} target_link_libraries(igl_imgui ${IGL_SCOPE}
igl::core igl::core
@ -86,7 +86,7 @@ index d7ffb9d..6152756 100644
imgui::imgui imgui::imgui
- imguizmo::imguizmo - imguizmo::imguizmo
- igl::imgui_fonts - igl::imgui_fonts
+ unofficial::imguizmo::imguizmo + imguizmo::imguizmo
) )
diff --git a/cmake/igl/modules/opengl.cmake b/cmake/igl/modules/opengl.cmake diff --git a/cmake/igl/modules/opengl.cmake b/cmake/igl/modules/opengl.cmake
index 4580c03..dfadb38 100644 index 4580c03..dfadb38 100644

View File

@ -128,7 +128,7 @@ index 6152756..34359c6 100644
+++ b/cmake/igl/modules/imgui.cmake +++ b/cmake/igl/modules/imgui.cmake
@@ -23,3 +23,6 @@ target_link_libraries(igl_imgui ${IGL_SCOPE} @@ -23,3 +23,6 @@ target_link_libraries(igl_imgui ${IGL_SCOPE}
imgui::imgui imgui::imgui
unofficial::imguizmo::imguizmo imguizmo::imguizmo
) )
+ +
+igl_install(igl_imgui ${INC_FILES} ${SRC_FILES}) +igl_install(igl_imgui ${INC_FILES} ${SRC_FILES})

View File

@ -1,7 +1,7 @@
{ {
"name": "libigl", "name": "libigl",
"version": "2.5.0", "version": "2.5.0",
"port-version": 1, "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.", "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", "homepage": "https://github.com/libigl/libigl",
"license": null, "license": null,

View File

@ -3666,7 +3666,7 @@
}, },
"imguizmo": { "imguizmo": {
"baseline": "2024-05-29", "baseline": "2024-05-29",
"port-version": 0 "port-version": 1
}, },
"immer": { "immer": {
"baseline": "0.8.1", "baseline": "0.8.1",
@ -4614,7 +4614,7 @@
}, },
"libigl": { "libigl": {
"baseline": "2.5.0", "baseline": "2.5.0",
"port-version": 1 "port-version": 2
}, },
"libilbc": { "libilbc": {
"baseline": "3.0.4", "baseline": "3.0.4",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "febc8a87c4fbc76155d002254572154b44b3d850",
"version-date": "2024-05-29",
"port-version": 1
},
{ {
"git-tree": "be2cf5fafba779840d87110933298add1dcb60f5", "git-tree": "be2cf5fafba779840d87110933298add1dcb60f5",
"version-date": "2024-05-29", "version-date": "2024-05-29",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "97c212824af2073c76a3437ffad728205eba3ce7",
"version": "2.5.0",
"port-version": 2
},
{ {
"git-tree": "ef3f6b72109e34fd02b28936fdc955e91044e089", "git-tree": "ef3f6b72109e34fd02b28936fdc955e91044e089",
"version": "2.5.0", "version": "2.5.0",