[libhv] Export CMake config files (microsoft#25042)

* [libhv] Export CMake config files * x-add-version * update patch * x-add-version Co-authored-by: Lily Wang <[email protected]>
Sharpe49 · Jun 6, 2022 · 3e7517b · 3e7517b
1 parent d431830
commit 3e7517b
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 2 deletions.
diff --git a/ports/libhv/fix-export_cmake.patch b/ports/libhv/fix-export_cmake.patch
@@ -0,0 +1,36 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f478fb4..1e3556a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -196,9 +196,10 @@ list_source_directories(LIBHV_SRCS ${LIBHV_SRCDIRS})
+ if(BUILD_SHARED)
+     add_library(hv SHARED ${LIBHV_SRCS})
+     target_compile_definitions(hv PRIVATE HV_DYNAMICLIB)
+-    target_include_directories(hv PRIVATE ${LIBHV_SRCDIRS})
++    target_include_directories(hv PRIVATE ${LIBHV_SRCDIRS} INTERFACE $<INSTALL_INTERFACE:include>)
+     target_link_libraries(hv ${LIBS})
+     install(TARGETS hv
++        EXPORT libhvConfig
+         ARCHIVE DESTINATION lib
+         LIBRARY DESTINATION lib
+         RUNTIME DESTINATION bin)
+@@ -208,14 +209,17 @@ endif()
+ if(BUILD_STATIC)
+     add_library(hv_static STATIC ${LIBHV_SRCS})
+     target_compile_definitions(hv_static PRIVATE HV_STATICLIB)
+-    target_include_directories(hv_static PRIVATE ${LIBHV_SRCDIRS})
++    target_include_directories(hv_static PRIVATE ${LIBHV_SRCDIRS} INTERFACE $<INSTALL_INTERFACE:include>)
+     target_link_libraries(hv_static ${LIBS})
+-    install(TARGETS hv_static DESTINATION lib)
++    install(TARGETS hv_static
++        EXPORT libhvConfig
++        ARCHIVE DESTINATION lib)
+     add_custom_target(libhv_static DEPENDS hv_static)
+ endif()
+
+ file(INSTALL ${LIBHV_HEADERS} DESTINATION include/hv)
+ install(FILES ${LIBHV_HEADERS} DESTINATION include/hv)
++install(EXPORT libhvConfig DESTINATION lib/cmake/libhv)
+
+ if(BUILD_SHARED)
+     set(HV_LIBRARIES hv CACHE INTERNAL "link hv libraries")
diff --git a/ports/libhv/portfile.cmake b/ports/libhv/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         fix-find_package.patch
+        fix-export_cmake.patch #Sync up the upstream changes
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
@@ -29,6 +30,7 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libhv)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

diff --git a/ports/libhv/vcpkg.json b/ports/libhv/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libhv",
   "version": "1.2.4",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Libhv is a C/C++ network library similar to libevent/libuv.",
   "homepage": "https://github.com/ithewei/libhv",
   "license": "BSD-3-Clause",
@@ -10,6 +10,10 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ],
   "features": {

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3662,7 +3662,7 @@
     },
     "libhv": {
       "baseline": "1.2.4",
-      "port-version": 1
+      "port-version": 2
     },
     "libhydrogen": {
       "baseline": "2021-12-02",

diff --git a/versions/l-/libhv.json b/versions/l-/libhv.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3533f306ae38ad29c619656d006ae9536bfcdcb4",
+      "version": "1.2.4",
+      "port-version": 2
+    },
     {
       "git-tree": "b5953fb3634520fafd04507d0a7266e92c87a129",
       "version": "1.2.4",