(#3054) add h3/3.7.0

* h3: fix hooks * h3: use find_package in test_package * add h3/3.7.0
conan-io · Sep 30, 2020 · f33ca76 · f33ca76
1 parent 2465528
commit f33ca76
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/recipes/h3/all/conandata.yml b/recipes/h3/all/conandata.yml
@@ -5,6 +5,9 @@ sources:
   "3.6.4":
     url: "https://github.com/uber/h3/archive/v3.6.4.tar.gz"
     sha256: "b80c2eee2b3e645de77893e27ca149e63d3bb6bf95d33e3a384e3f390e2681bb"
+  "3.7.0":
+    url: "https://github.com/uber/h3/archive/v3.7.0.tar.gz"
+    sha256: "7b59780781750d2ccc64c50b6364d706947a684b0cb996c1b104f448562d2d7c"
 patches:
   "3.6.4":
     - patch_file: "patches/fix-cmake-install-3.6.4.patch"

diff --git a/recipes/h3/all/test_package/CMakeLists.txt b/recipes/h3/all/test_package/CMakeLists.txt
@@ -1,8 +1,10 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 3.1)
 project(test_package C)
 
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup()
 
+find_package(h3 REQUIRED CONFIG)
+
 add_executable(${PROJECT_NAME} test_package.c)
-target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS})
+target_link_libraries(${PROJECT_NAME} h3::h3)
diff --git a/recipes/h3/all/test_package/conanfile.py b/recipes/h3/all/test_package/conanfile.py
@@ -4,7 +4,7 @@
 
 class TestPackageConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
-    generators = "cmake"
+    generators = "cmake", "cmake_find_package_multi"
 
     def build(self):
         cmake = CMake(self)

diff --git a/recipes/h3/config.yml b/recipes/h3/config.yml
@@ -3,3 +3,5 @@ versions:
     folder: all
   "3.6.4":
     folder: all
+  "3.7.0":
+    folder: all