From 8c27859cf2b087a7089ce1db601b3967b028e527 Mon Sep 17 00:00:00 2001 From: Jonathan Higgs Date: Sat, 17 Jul 2021 13:36:13 +0100 Subject: [PATCH 01/10] [imguizmo] new port --- ports/imguizmo/CMakeLists.txt | 59 +++++++++++++++++++++++++++++++++++ ports/imguizmo/portfile.cmake | 25 +++++++++++++++ ports/imguizmo/vcpkg.json | 9 ++++++ versions/baseline.json | 4 +++ versions/i-/imguizmo.json | 9 ++++++ 5 files changed, 106 insertions(+) create mode 100644 ports/imguizmo/CMakeLists.txt create mode 100644 ports/imguizmo/portfile.cmake create mode 100644 ports/imguizmo/vcpkg.json create mode 100644 versions/i-/imguizmo.json diff --git a/ports/imguizmo/CMakeLists.txt b/ports/imguizmo/CMakeLists.txt new file mode 100644 index 00000000000000..e9097842e0e614 --- /dev/null +++ b/ports/imguizmo/CMakeLists.txt @@ -0,0 +1,59 @@ +cmake_minimum_required(VERSION 3.8) +project(imguizmo) + +find_package(imgui CONFIG REQUIRED) +get_target_property(IMGUI_INCLUDE_DIRS imgui::imgui + INTERFACE_INCLUDE_DIRECTORIES +) + +set(CMAKE_DEBUG_POSTFIX d) + +add_library(${PROJECT_NAME} "") +add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) + +target_include_directories( + ${PROJECT_NAME} + PUBLIC + $ + $ + PRIVATE + ${IMGUI_INCLUDE_DIRS} +) + +target_sources( + ${PROJECT_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/GraphEditor.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ImCurveEdit.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ImGradient.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ImGuizmo.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ImSequencer.cpp +) + +install( + TARGETS ${PROJECT_NAME} + EXPORT ${PROJECT_NAME}_target + ARCHIVE DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin +) + +if (NOT IMGUIZMO_SKIP_HEADERS) + install( + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/GraphEditor.h + ${CMAKE_CURRENT_SOURCE_DIR}/ImCurveEdit.h + ${CMAKE_CURRENT_SOURCE_DIR}/ImGradient.h + ${CMAKE_CURRENT_SOURCE_DIR}/ImGuizmo.h + ${CMAKE_CURRENT_SOURCE_DIR}/ImSequencer.h + ${CMAKE_CURRENT_SOURCE_DIR}/ImZoomSlider.h + DESTINATION include + ) +endif() + +install( + EXPORT ${PROJECT_NAME}_target + NAMESPACE ${PROJECT_NAME}:: + FILE ${PROJECT_NAME}-config.cmake + DESTINATION share/${PROJECT_NAME} +) \ No newline at end of file diff --git a/ports/imguizmo/portfile.cmake b/ports/imguizmo/portfile.cmake new file mode 100644 index 00000000000000..1b07957a098286 --- /dev/null +++ b/ports/imguizmo/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CedricGuillemet/ImGuizmo + REF 7daa4b24ffe08b906040079bf297e8b920f86f47 + SHA512 dd4d5ee47753f7f70519f94dd63ab19badc962d02f05e847bc1b9fc9798a5fa617daf9d801dcc9856ffbb989c3070defe71f6d3706eefa72c165327a0d577d22 + HEAD_REF master +) + +file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DIMGUIZMO_SKIP_HEADERS=ON +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/imguizmo/vcpkg.json b/ports/imguizmo/vcpkg.json new file mode 100644 index 00000000000000..c06d9442599c48 --- /dev/null +++ b/ports/imguizmo/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "imguizmo", + "version-string": "2021-07-15", + "description": "Immediate mode 3D gizmo for scene editing and other controls based on Dear ImGui", + "homepage": "https://github.com/CedricGuillemet/ImGuizmo", + "dependencies": [ + "imgui" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 88a4bcd85a9ef8..90bb344f6768de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2664,6 +2664,10 @@ "baseline": "2.1-2", "port-version": 0 }, + "imguizmo": { + "baseline": "2021-07-15", + "port-version": 0 + }, "immer": { "baseline": "2019-06-07", "port-version": 0 diff --git a/versions/i-/imguizmo.json b/versions/i-/imguizmo.json new file mode 100644 index 00000000000000..bfd479465d657e --- /dev/null +++ b/versions/i-/imguizmo.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e9e99f67175df01ac1e928ac2b063ebb6e29c921", + "version-string": "2021-07-15", + "port-version": 0 + } + ] +} From 3062585c5e7938e0d6e0c785e58d3fcca617e6be Mon Sep 17 00:00:00 2001 From: Jonathan Higgs Date: Mon, 19 Jul 2021 18:27:43 +0100 Subject: [PATCH 02/10] [imguizmo] Apply suggestions from code review Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/imguizmo/portfile.cmake | 13 +++++++------ ports/imguizmo/vcpkg.json | 12 ++++++++++-- versions/i-/imguizmo.json | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ports/imguizmo/portfile.cmake b/ports/imguizmo/portfile.cmake index 1b07957a098286..db13863ea837f2 100644 --- a/ports/imguizmo/portfile.cmake +++ b/ports/imguizmo/portfile.cmake @@ -8,18 +8,19 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( + +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS_DEBUG -DIMGUIZMO_SKIP_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() + vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/imguizmo/vcpkg.json b/ports/imguizmo/vcpkg.json index c06d9442599c48..c270c2d384fd96 100644 --- a/ports/imguizmo/vcpkg.json +++ b/ports/imguizmo/vcpkg.json @@ -1,9 +1,17 @@ { "name": "imguizmo", - "version-string": "2021-07-15", + "version-date": "2021-07-15", "description": "Immediate mode 3D gizmo for scene editing and other controls based on Dear ImGui", "homepage": "https://github.com/CedricGuillemet/ImGuizmo", "dependencies": [ - "imgui" + "imgui", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/i-/imguizmo.json b/versions/i-/imguizmo.json index bfd479465d657e..574c11e2b2c43a 100644 --- a/versions/i-/imguizmo.json +++ b/versions/i-/imguizmo.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e9e99f67175df01ac1e928ac2b063ebb6e29c921", + "git-tree": "27cb106055dc73b6330d8494c8c981d1b235ba4c", "version-string": "2021-07-15", "port-version": 0 } From 64ab82fb888793063d0ddc74ef2ed513fc129862 Mon Sep 17 00:00:00 2001 From: Jonathan Higgs Date: Mon, 19 Jul 2021 18:49:42 +0100 Subject: [PATCH 03/10] [imguizmo] fix formatting --- ports/imguizmo/vcpkg.json | 14 +++++++------- versions/i-/imguizmo.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/imguizmo/vcpkg.json b/ports/imguizmo/vcpkg.json index c270c2d384fd96..bff63720d581a1 100644 --- a/ports/imguizmo/vcpkg.json +++ b/ports/imguizmo/vcpkg.json @@ -6,12 +6,12 @@ "dependencies": [ "imgui", { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/i-/imguizmo.json b/versions/i-/imguizmo.json index 574c11e2b2c43a..e524268cba67ae 100644 --- a/versions/i-/imguizmo.json +++ b/versions/i-/imguizmo.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "27cb106055dc73b6330d8494c8c981d1b235ba4c", + "git-tree": "ffb654799b70ca535a4b6aa2de3c67b3d1f4644b", "version-string": "2021-07-15", "port-version": 0 } From 1b6a7dbf5c0e80d69efec510b36cb73cab96095b Mon Sep 17 00:00:00 2001 From: Jonathan Higgs Date: Mon, 19 Jul 2021 19:07:28 +0100 Subject: [PATCH 04/10] [imguizmo] fix version-date --- versions/i-/imguizmo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/i-/imguizmo.json b/versions/i-/imguizmo.json index e524268cba67ae..4379a360aa1655 100644 --- a/versions/i-/imguizmo.json +++ b/versions/i-/imguizmo.json @@ -2,7 +2,7 @@ "versions": [ { "git-tree": "ffb654799b70ca535a4b6aa2de3c67b3d1f4644b", - "version-string": "2021-07-15", + "version-date": "2021-07-15", "port-version": 0 } ] From 63dca2256bbfa79b4df7b72bd47fdcedd55e96cc Mon Sep 17 00:00:00 2001 From: Jonathan Higgs Date: Tue, 20 Jul 2021 09:40:15 +0100 Subject: [PATCH 05/10] [imguizmo] apply suggestions from code review Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/imguizmo/portfile.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/imguizmo/portfile.cmake b/ports/imguizmo/portfile.cmake index db13863ea837f2..9b7ffcc893f0bf 100644 --- a/ports/imguizmo/portfile.cmake +++ b/ports/imguizmo/portfile.cmake @@ -8,18 +8,19 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG -DIMGUIZMO_SKIP_HEADERS=ON ) vcpkg_cmake_install() - vcpkg_copy_pdbs() vcpkg_cmake_config_fixup() From 37c33cd2d61ab1cf03cefbe23d1566440eb3f121 Mon Sep 17 00:00:00 2001 From: Jonathan Higgs Date: Tue, 20 Jul 2021 10:21:31 +0100 Subject: [PATCH 06/10] [imguizmo] apply suggestions from code review Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/imguizmo/portfile.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/imguizmo/portfile.cmake b/ports/imguizmo/portfile.cmake index 9b7ffcc893f0bf..403b73bb915870 100644 --- a/ports/imguizmo/portfile.cmake +++ b/ports/imguizmo/portfile.cmake @@ -10,11 +10,8 @@ vcpkg_from_github( file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_DEBUG -DIMGUIZMO_SKIP_HEADERS=ON ) @@ -24,4 +21,4 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From ff85c86318e7acab8fade6dd29c1d499baf94588 Mon Sep 17 00:00:00 2001 From: Jonathan Higgs Date: Tue, 20 Jul 2021 09:42:18 +0100 Subject: [PATCH 07/10] [imguizmo] add std version requirement --- ports/imguizmo/CMakeLists.txt | 2 ++ versions/i-/imguizmo.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/imguizmo/CMakeLists.txt b/ports/imguizmo/CMakeLists.txt index e9097842e0e614..55f337ee85d488 100644 --- a/ports/imguizmo/CMakeLists.txt +++ b/ports/imguizmo/CMakeLists.txt @@ -11,6 +11,8 @@ set(CMAKE_DEBUG_POSTFIX d) add_library(${PROJECT_NAME} "") add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) +target_compile_options(${PROJECT_NAME} PRIVATE "-std=c++11") + target_include_directories( ${PROJECT_NAME} PUBLIC diff --git a/versions/i-/imguizmo.json b/versions/i-/imguizmo.json index 4379a360aa1655..37a6aa1ff35bab 100644 --- a/versions/i-/imguizmo.json +++ b/versions/i-/imguizmo.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ffb654799b70ca535a4b6aa2de3c67b3d1f4644b", + "git-tree": "33030adc4f25d42d2c12ef81dbd6cd8367b0d93b", "version-date": "2021-07-15", "port-version": 0 } From 9cae26d7fa43990df883318946ba3ada46e4cf2d Mon Sep 17 00:00:00 2001 From: Jonathan Higgs Date: Tue, 20 Jul 2021 10:22:28 +0100 Subject: [PATCH 08/10] [imguizmo] remove debug lib rename --- ports/imguizmo/CMakeLists.txt | 2 -- versions/i-/imguizmo.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/imguizmo/CMakeLists.txt b/ports/imguizmo/CMakeLists.txt index 55f337ee85d488..1b552bae2d105d 100644 --- a/ports/imguizmo/CMakeLists.txt +++ b/ports/imguizmo/CMakeLists.txt @@ -6,8 +6,6 @@ get_target_property(IMGUI_INCLUDE_DIRS imgui::imgui INTERFACE_INCLUDE_DIRECTORIES ) -set(CMAKE_DEBUG_POSTFIX d) - add_library(${PROJECT_NAME} "") add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) diff --git a/versions/i-/imguizmo.json b/versions/i-/imguizmo.json index 37a6aa1ff35bab..0e3830d610206a 100644 --- a/versions/i-/imguizmo.json +++ b/versions/i-/imguizmo.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "33030adc4f25d42d2c12ef81dbd6cd8367b0d93b", + "git-tree": "4e4dbabfc0ed8f82419c799bc5f240d50c973595", "version-date": "2021-07-15", "port-version": 0 } From d535c79b2bf5fb1a111e7527666032ada786ee21 Mon Sep 17 00:00:00 2001 From: Jonathan Higgs Date: Tue, 20 Jul 2021 17:18:28 +0100 Subject: [PATCH 09/10] [imguizmo] update to use v1.83 tag --- ports/imguizmo/portfile.cmake | 2 +- ports/imguizmo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/imguizmo.json | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/imguizmo/portfile.cmake b/ports/imguizmo/portfile.cmake index 403b73bb915870..bd6665de3805d6 100644 --- a/ports/imguizmo/portfile.cmake +++ b/ports/imguizmo/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CedricGuillemet/ImGuizmo - REF 7daa4b24ffe08b906040079bf297e8b920f86f47 + REF v1.83 SHA512 dd4d5ee47753f7f70519f94dd63ab19badc962d02f05e847bc1b9fc9798a5fa617daf9d801dcc9856ffbb989c3070defe71f6d3706eefa72c165327a0d577d22 HEAD_REF master ) diff --git a/ports/imguizmo/vcpkg.json b/ports/imguizmo/vcpkg.json index bff63720d581a1..09184a7230f7af 100644 --- a/ports/imguizmo/vcpkg.json +++ b/ports/imguizmo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "imguizmo", - "version-date": "2021-07-15", + "version": "1.83", "description": "Immediate mode 3D gizmo for scene editing and other controls based on Dear ImGui", "homepage": "https://github.com/CedricGuillemet/ImGuizmo", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 90bb344f6768de..0157e2f514d257 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2665,7 +2665,7 @@ "port-version": 0 }, "imguizmo": { - "baseline": "2021-07-15", + "baseline": "1.83", "port-version": 0 }, "immer": { diff --git a/versions/i-/imguizmo.json b/versions/i-/imguizmo.json index 0e3830d610206a..691f9304c54880 100644 --- a/versions/i-/imguizmo.json +++ b/versions/i-/imguizmo.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "4e4dbabfc0ed8f82419c799bc5f240d50c973595", - "version-date": "2021-07-15", + "git-tree": "e72b6c21eae80a46d34a6cb2111c814cbe3085ff", + "version": "1.83", "port-version": 0 } ] From 31df0ece2498cd7848043451400468be87d082e6 Mon Sep 17 00:00:00 2001 From: Jonathan Higgs Date: Tue, 20 Jul 2021 17:27:47 +0100 Subject: [PATCH 10/10] [imguizmo] fixed hash --- ports/imguizmo/portfile.cmake | 4 ++-- versions/i-/imguizmo.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/imguizmo/portfile.cmake b/ports/imguizmo/portfile.cmake index bd6665de3805d6..342001ea8d63a5 100644 --- a/ports/imguizmo/portfile.cmake +++ b/ports/imguizmo/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CedricGuillemet/ImGuizmo - REF v1.83 - SHA512 dd4d5ee47753f7f70519f94dd63ab19badc962d02f05e847bc1b9fc9798a5fa617daf9d801dcc9856ffbb989c3070defe71f6d3706eefa72c165327a0d577d22 + REF 1.83 + SHA512 23285398688b4cdf3128ecb918b70c9a52f06c8e911da57430442b838cecf653e233d8cdfefc6acd3e4da381869ffc6fb74bcaaafc8e33657d6060a645517363 HEAD_REF master ) diff --git a/versions/i-/imguizmo.json b/versions/i-/imguizmo.json index 691f9304c54880..096f3964102449 100644 --- a/versions/i-/imguizmo.json +++ b/versions/i-/imguizmo.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e72b6c21eae80a46d34a6cb2111c814cbe3085ff", + "git-tree": "9611b5ef89fd20182ee8d6c84c505e986f3ea880", "version": "1.83", "port-version": 0 }