From 1aa7b212c5f4ea78b164d313b6c2bc7d28018d62 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Fri, 8 Sep 2023 09:08:42 +0200
Subject: [PATCH] [libmesh] fix post build checks (#33518)

---
 ports/libmesh/portfile.cmake | 32 +++++++++++++-------------------
 ports/libmesh/vcpkg.json     |  4 ++--
 scripts/ci.baseline.txt      | 12 ------------
 versions/baseline.json       |  2 +-
 versions/l-/libmesh.json     |  5 +++++
 5 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/ports/libmesh/portfile.cmake b/ports/libmesh/portfile.cmake
index c4810b560c..b0cf639b42 100644
--- a/ports/libmesh/portfile.cmake
+++ b/ports/libmesh/portfile.cmake
@@ -16,7 +16,7 @@ endif()
 # but there are a lot more which need to be checked/fixed
 # So this port can only be considered a Work In Progress
 vcpkg_configure_make(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS ${OPTIONS}
     OPTIONS_DEBUG --with-methods=dbg
     OPTIONS_RELEASE --with-methods=opt
@@ -24,30 +24,24 @@ vcpkg_configure_make(
 
 vcpkg_install_make()
 
-if (EXISTS ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool)
-    file(COPY ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool)
-endif()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/contrib)
-
-file(GLOB LIBMESH_EXAMPLES ${CURRENT_PACKAGES_DIR}/examples/*)
-foreach (LIBMESH_EXAMPLE ${LIBMESH_EXAMPLES})
-    file(COPY ${LIBMESH_EXAMPLE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
-endforeach()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/examples)
+file(RENAME "${CURRENT_PACKAGES_DIR}/examples" "${CURRENT_PACKAGES_DIR}/share/${PORT}/examples")
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
 # Remove tools and debug include directories
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/contrib ${CURRENT_PACKAGES_DIR}/debug/etc
-                    ${CURRENT_PACKAGES_DIR}/debug/examples ${CURRENT_PACKAGES_DIR}/debug/include
-                    ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/tools/libmesh/debug
-                    ${CURRENT_PACKAGES_DIR}/Make.common ${CURRENT_PACKAGES_DIR}/debug/Make.common)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/contrib" "${CURRENT_PACKAGES_DIR}/debug/contrib"
+                    "${CURRENT_PACKAGES_DIR}/etc" "${CURRENT_PACKAGES_DIR}/debug/etc"
+                    "${CURRENT_PACKAGES_DIR}/debug/examples" "${CURRENT_PACKAGES_DIR}/debug/include"
+                    "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/tools/libmesh/debug"
+                    "${CURRENT_PACKAGES_DIR}/Make.common" "${CURRENT_PACKAGES_DIR}/debug/Make.common")
+
+file(GLOB config_files "${CURRENT_PACKAGES_DIR}/bin/*-config" "${CURRENT_PACKAGES_DIR}/debug/bin/*-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/*-config")
+file(REMOVE_RECURSE ${config_files})
 
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libmesh/libmesh_config.h" "${CURRENT_INSTALLED_DIR}" "")
 
-file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-
+vcpkg_install_copyright(FILE_LIST "${CURRENT_PORT_DIR}/copyright")
diff --git a/ports/libmesh/vcpkg.json b/ports/libmesh/vcpkg.json
index 8981af66f3..3127369e02 100644
--- a/ports/libmesh/vcpkg.json
+++ b/ports/libmesh/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "libmesh",
   "version": "1.5.0",
-  "port-version": 5,
+  "port-version": 6,
   "description": "The libMesh library provides a framework for the numerical simulation of partial differential equations using arbitrary unstructured discretizations on serial and parallel platforms. A major goal of the library is to provide support for adaptive mesh refinement (AMR) computations in parallel while allowing a research scientist to focus on the physics they are modeling.",
   "homepage": "https://github.com/libMesh/libmesh",
   "license": "LGPL-2.1-only",
-  "supports": "!xbox"
+  "supports": "linux"
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 5a0857a0a7..25e039ff42 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -610,18 +610,6 @@ libmariadb:x64-windows        = skip
 libmariadb:x64-windows-static = skip
 libmariadb:x64-windows-static-md=skip
 # libmesh installs tons of problematic files that conflict with other ports (boost, eigen, etc)
-libmesh:arm-neon-android=skip
-libmesh:arm64-android=skip
-libmesh:arm64-windows=skip
-libmesh:arm-uwp=skip
-libmesh:x64-android=skip
-libmesh:x64-uwp=skip
-libmesh:x64-windows=skip
-libmesh:x64-windows-static=skip
-libmesh:x64-windows-static-md=skip
-libmesh:x86-windows=skip
-libmesh:x64-osx=skip
-libmesh:arm64-osx=skip
 libmesh:x64-linux=skip
 libmikmod:arm-neon-android=fail
 libmikmod:arm64-android=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index dd1a90f25a..f13ec3a616 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4342,7 +4342,7 @@
     },
     "libmesh": {
       "baseline": "1.5.0",
-      "port-version": 5
+      "port-version": 6
     },
     "libmicrodns": {
       "baseline": "0.2.0",
diff --git a/versions/l-/libmesh.json b/versions/l-/libmesh.json
index e7b3fb1027..6aae1b7e5a 100644
--- a/versions/l-/libmesh.json
+++ b/versions/l-/libmesh.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7c6d096079002a5a867cccb4f6204f871eeaf2e1",
+      "version": "1.5.0",
+      "port-version": 6
+    },
     {
       "git-tree": "73d90f24859b402b05ffe0e27eea3db3ab58a2ea",
       "version": "1.5.0",