[libremidi] Fix install path of the lib file (microsoft#34718)

* [libremidi] Fix install path of the lib file * update version
jimwang118 · Oct 26, 2023 · 27728bb · 27728bb
1 parent 3961f34
commit 27728bb
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/ports/libremidi/fix-install.patch b/ports/libremidi/fix-install.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/libremidi.install.cmake b/cmake/libremidi.install.cmake
+index 08e17f5..985e9a5 100644
+--- a/cmake/libremidi.install.cmake
++++ b/cmake/libremidi.install.cmake
+@@ -1,7 +1,7 @@
+ if(NOT LIBREMIDI_HEADER_ONLY)
+   install(TARGETS libremidi
+           EXPORT libremidi-targets
+-          ARCHIVE DESTINATION lib/static
++          ARCHIVE DESTINATION lib
+           RUNTIME DESTINATION bin
+           LIBRARY DESTINATION lib
+   )
diff --git a/ports/libremidi/portfile.cmake b/ports/libremidi/portfile.cmake
@@ -2,9 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jcelerier/libremidi
     REF "v${VERSION}"
-
     SHA512 de7092c70af6fc0a23c8e6018fbd9f380632ac9dec8794171726fda9a6e7ba45479a8e8317919ba7a8a0267524bab8d5430782a54bc50a914658cf277e18145b
     HEAD_REF master
+    PATCHES
+        fix-install.patch
 )
 
 vcpkg_list(SET options)
@@ -22,7 +23,7 @@ vcpkg_cmake_configure(
         -DLIBREMIDI_NO_JACK=ON
 )
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libremidi PACKAGE_NAME libremidi)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/ports/libremidi/vcpkg.json b/ports/libremidi/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libremidi",
   "version": "4.2.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A modern C++ MIDI real-time & file I/O library",
   "homepage": "https://github.com/jcelerier/libremidi",
   "license": "BSD-2-Clause",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4638,7 +4638,7 @@
     },
     "libremidi": {
       "baseline": "4.2.3",
-      "port-version": 1
+      "port-version": 2
     },
     "libressl": {
       "baseline": "3.6.2",

diff --git a/versions/l-/libremidi.json b/versions/l-/libremidi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4269a93684ffd5145f2b5a79421824b6efd87372",
+      "version": "4.2.3",
+      "port-version": 2
+    },
     {
       "git-tree": "4427d9259242a0dbc53753710b42b6531276f392",
       "version": "4.2.3",