[MyGUI] update to 3.4.1 (#22015)

* [MyGUI] update to 3.4.1 * update version
microsoft · Dec 14, 2021 · a674f79 · a674f79
1 parent dcde522
commit a674f79
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 42 deletions.
diff --git a/ports/mygui/fix-generation.patch b/ports/mygui/fix-generation.patch
@@ -1,5 +1,5 @@
 diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
-index b0fc12a82..6e545edea 100644
+index a0ef573..b77566e 100644
 --- a/CMake/CMakeLists.txt
 +++ b/CMake/CMakeLists.txt
 @@ -5,7 +5,7 @@
@@ -12,10 +12,10 @@ index b0fc12a82..6e545edea 100644
  	set(MYGUI_CMAKE_DIR "lib/MYGUI/cmake")
  endif(WIN32)
 diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
-index d1dbd016d..25c8bbac6 100644
+index 8fb1ce4..6483339 100644
 --- a/CMake/Utils/MyGUIConfigTargets.cmake
 +++ b/CMake/Utils/MyGUIConfigTargets.cmake
-@@ -6,10 +6,10 @@ if (WIN32)
+@@ -7,10 +7,10 @@ if (WIN32)
  	set(MYGUI_RELWDBG_PATH "/RelWithDebInfo")
  	set(MYGUI_MINSIZE_PATH "/MinSizeRel")
  	set(MYGUI_DEBUG_PATH "/Debug")
@@ -28,28 +28,3 @@ index d1dbd016d..25c8bbac6 100644
  	set(MYGUI_PLUGIN_PATH "/opt")
  elseif (UNIX)
  	set(MYGUI_RELEASE_PATH "")
-diff --git a/CMake/Utils/PrecompiledHeader.cmake b/CMake/Utils/PrecompiledHeader.cmake
-index a8bf3ce49..104703282 100644
---- a/CMake/Utils/PrecompiledHeader.cmake
-+++ b/CMake/Utils/PrecompiledHeader.cmake
-@@ -16,7 +16,7 @@
- macro(use_precompiled_header TARGET HEADER_FILE SRC_FILE)
-   get_filename_component(HEADER ${HEADER_FILE} NAME)
-
--  if (MSVC AND NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-+  if (FALSE)
-     add_definitions(/Yu"${HEADER}")
-     set_source_files_properties(${SRC_FILE}
-       PROPERTIES COMPILE_FLAGS /Yc"${HEADER}"
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fea0bff8b..5831dfa8a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,6 +9,7 @@ cmake_minimum_required(VERSION 2.6)
- set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
- cmake_policy(SET CMP0003 NEW)
- cmake_policy(SET CMP0011 NEW)
-+cmake_policy(SET CMP0021 OLD)
-
- project(MYGUI)
-
diff --git a/ports/mygui/portfile.cmake b/ports/mygui/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO MyGUI/mygui
-    REF 26109822f36a4f7d72d5d8ecd41659897f085a40
-    SHA512 4d1f001e8c04d08ad911bc0345a2287b5e17e21284728cf23d7a930e8befb2f85902053e3c90283444bf9e32c7dada2f37c498e735d6314732b297d97ed339e4
+    REF 81e5c67e92920607d16bc2aee1ac32f6fd7d446b #v3.4.1
+    SHA512 b13e0a08559b3ddfe42ffcc6cf017fb20d50168785fb551e16f613c60b9ea28a65056a9bc42bdab876368f40dcba1772bc704ad0928c45d8b32e909abc0f1916 
     HEAD_REF master
     PATCHES
         fix-generation.patch
@@ -18,9 +18,8 @@ else()
     set(MYGUI_RENDERSYSTEM 1)
 endif()
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DMYGUI_STATIC=TRUE
         -DMYGUI_BUILD_DEMOS=FALSE
@@ -33,12 +32,12 @@ vcpkg_configure_cmake(
         -DMYGUI_RENDERSYSTEM=${MYGUI_RENDERSYSTEM}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/debug/include
-    ${CURRENT_PACKAGES_DIR}/debug/share
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
 )
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/mygui/vcpkg.json b/ports/mygui/vcpkg.json
@@ -1,12 +1,19 @@
 {
   "name": "mygui",
-  "version-string": "2020-06-17",
-  "port-version": 1,
+  "version": "3.4.1",
   "description": "Fast, flexible and simple GUI",
   "homepage": "http://mygui.info",
   "dependencies": [
     "freetype",
-    "sdl2-image"
+    "sdl2-image",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ],
   "features": {
     "opengl": {

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4597,8 +4597,8 @@
       "port-version": 4
     },
     "mygui": {
-      "baseline": "2020-06-17",
-      "port-version": 1
+      "baseline": "3.4.1",
+      "port-version": 0
     },
     "nameof": {
       "baseline": "0.10.1",

diff --git a/versions/m-/mygui.json b/versions/m-/mygui.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6e9074e901ba523a48254a18b5d8e7f3807619be",
+      "version": "3.4.1",
+      "port-version": 0
+    },
     {
       "git-tree": "9d8226795430e83c733e936821400cf792265656",
       "version-string": "2020-06-17",