From 2d2b7d172d7c32413ff3baf8a81ed4965ccee6f2 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:26:57 -0700 Subject: [PATCH] [imguizmo] Remove keyword unofficial of imguizmo's usage (#40678) Co-authored-by: Lily Wang --- ports/imguizmo/CMakeLists.txt | 10 +++++----- ports/imguizmo/portfile.cmake | 2 +- ports/imguizmo/vcpkg.json | 1 + ports/libigl/dependencies.patch | 4 ++-- ports/libigl/install-extra-targets.patch | 2 +- ports/libigl/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/i-/imguizmo.json | 5 +++++ versions/l-/libigl.json | 5 +++++ 9 files changed, 23 insertions(+), 12 deletions(-) diff --git a/ports/imguizmo/CMakeLists.txt b/ports/imguizmo/CMakeLists.txt index bcb4e5f238..03831cbeb7 100644 --- a/ports/imguizmo/CMakeLists.txt +++ b/ports/imguizmo/CMakeLists.txt @@ -31,7 +31,7 @@ target_sources( install( TARGETS ${PROJECT_NAME} - EXPORT unofficial-${PROJECT_NAME}-target + EXPORT ${PROJECT_NAME}-target ARCHIVE DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin @@ -51,8 +51,8 @@ if (NOT IMGUIZMO_SKIP_HEADERS) endif() install( - EXPORT unofficial-${PROJECT_NAME}-target - NAMESPACE unofficial::${PROJECT_NAME}:: - FILE unofficial-${PROJECT_NAME}-config.cmake - DESTINATION share/unofficial-${PROJECT_NAME} + EXPORT ${PROJECT_NAME}-target + NAMESPACE ${PROJECT_NAME}:: + FILE ${PROJECT_NAME}-config.cmake + DESTINATION share/${PROJECT_NAME} ) diff --git a/ports/imguizmo/portfile.cmake b/ports/imguizmo/portfile.cmake index 8c6e1cfacf..9631d8b178 100644 --- a/ports/imguizmo/portfile.cmake +++ b/ports/imguizmo/portfile.cmake @@ -19,6 +19,6 @@ vcpkg_cmake_configure( vcpkg_cmake_install() 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") diff --git a/ports/imguizmo/vcpkg.json b/ports/imguizmo/vcpkg.json index d1f7722175..3cdc4029a7 100644 --- a/ports/imguizmo/vcpkg.json +++ b/ports/imguizmo/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imguizmo", "version-date": "2024-05-29", + "port-version": 1, "description": "Immediate mode 3D gizmo for scene editing and other controls based on Dear ImGui", "homepage": "https://github.com/CedricGuillemet/ImGuizmo", "license": "MIT", diff --git a/ports/libigl/dependencies.patch b/ports/libigl/dependencies.patch index fd8e5e3cce..b7c3fbdb1f 100644 --- a/ports/libigl/dependencies.patch +++ b/ports/libigl/dependencies.patch @@ -78,7 +78,7 @@ index d7ffb9d..6152756 100644 -include(imguizmo) -include(libigl_imgui_fonts) +find_package(imgui CONFIG REQUIRED) -+find_package(unofficial-imguizmo CONFIG REQUIRED) ++find_package(imguizmo CONFIG REQUIRED) igl_include(glfw) target_link_libraries(igl_imgui ${IGL_SCOPE} igl::core @@ -86,7 +86,7 @@ index d7ffb9d..6152756 100644 imgui::imgui - imguizmo::imguizmo - igl::imgui_fonts -+ unofficial::imguizmo::imguizmo ++ imguizmo::imguizmo ) diff --git a/cmake/igl/modules/opengl.cmake b/cmake/igl/modules/opengl.cmake index 4580c03..dfadb38 100644 diff --git a/ports/libigl/install-extra-targets.patch b/ports/libigl/install-extra-targets.patch index ae88effc80..040243382a 100644 --- a/ports/libigl/install-extra-targets.patch +++ b/ports/libigl/install-extra-targets.patch @@ -128,7 +128,7 @@ index 6152756..34359c6 100644 +++ b/cmake/igl/modules/imgui.cmake @@ -23,3 +23,6 @@ target_link_libraries(igl_imgui ${IGL_SCOPE} imgui::imgui - unofficial::imguizmo::imguizmo + imguizmo::imguizmo ) + +igl_install(igl_imgui ${INC_FILES} ${SRC_FILES}) diff --git a/ports/libigl/vcpkg.json b/ports/libigl/vcpkg.json index 7b3fd97711..ddc0e4ef3a 100644 --- a/ports/libigl/vcpkg.json +++ b/ports/libigl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libigl", "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.", "homepage": "https://github.com/libigl/libigl", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index a71c376e2b..c0f1c7fab7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3666,7 +3666,7 @@ }, "imguizmo": { "baseline": "2024-05-29", - "port-version": 0 + "port-version": 1 }, "immer": { "baseline": "0.8.1", @@ -4614,7 +4614,7 @@ }, "libigl": { "baseline": "2.5.0", - "port-version": 1 + "port-version": 2 }, "libilbc": { "baseline": "3.0.4", diff --git a/versions/i-/imguizmo.json b/versions/i-/imguizmo.json index 03633c690c..f6a3914cee 100644 --- a/versions/i-/imguizmo.json +++ b/versions/i-/imguizmo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "febc8a87c4fbc76155d002254572154b44b3d850", + "version-date": "2024-05-29", + "port-version": 1 + }, { "git-tree": "be2cf5fafba779840d87110933298add1dcb60f5", "version-date": "2024-05-29", diff --git a/versions/l-/libigl.json b/versions/l-/libigl.json index ba30f85a2a..fd2dd68279 100644 --- a/versions/l-/libigl.json +++ b/versions/l-/libigl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97c212824af2073c76a3437ffad728205eba3ce7", + "version": "2.5.0", + "port-version": 2 + }, { "git-tree": "ef3f6b72109e34fd02b28936fdc955e91044e089", "version": "2.5.0",