libcurl: Fix http2 detection in CMake builds (#26742)

--------- Co-authored-by: Ernesto de Gracia Herranz <[email protected]>
conan-io · Mar 3, 2025 · 7a07693 · 7a07693
1 parent a6ac366
commit 7a07693
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/recipes/libcurl/all/conanfile.py b/recipes/libcurl/all/conanfile.py
@@ -381,6 +381,7 @@ def _patch_cmake(self):
             replace_in_file(self, cmakelists, "find_package(NGHTTP2 REQUIRED)", "find_package(libnghttp2 REQUIRED CONFIG)")
         else:
             replace_in_file(self, cmakelists, "find_package(NGHTTP2)", "find_package(libnghttp2 REQUIRED CONFIG)")
+            replace_in_file(self, cmakelists, "NGHTTP2_FOUND", "libnghttp2_FOUND")
         replace_in_file(self, cmakelists, "${NGHTTP2_INCLUDE_DIRS}", "${libnghttp2_INCLUDE_DIRS}")
         replace_in_file(self, cmakelists, "${NGHTTP2_LIBRARIES}", "libnghttp2::nghttp2")
 

diff --git a/recipes/libcurl/all/test_package/test_package.c b/recipes/libcurl/all/test_package/test_package.c
@@ -6,6 +6,7 @@ int main(void)
   CURL *curl;
   int retval = 0;
   const char *const *proto;
+  const char *const *feat;
   curl_version_info_data* id = curl_version_info(CURLVERSION_NOW);
   if (!id)
     return 1;
@@ -14,7 +15,12 @@ int main(void)
   for(proto = id->protocols; *proto; proto++) {
     printf("%s ", *proto);
   }
-  printf("\nversion: %s\nssl version: %s\nfeatures: %d\n", id->version, id->ssl_version, id->features);
+  printf("\nversion: %s\nssl version: %s\n", id->version, id->ssl_version);
+
+  printf("features: ");
+  for(feat = id->feature_names; *feat; feat++) {
+    printf("%s ", *feat);
+  }
 
   curl = curl_easy_init();
   if(curl) {