Start using conan generator cmake_find_package_multi by default

DavidAce · Nov 28, 2021 · cc653bd · cc653bd
1 parent 927bd00
commit cc653bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -12,8 +12,8 @@ class h5ppConan(ConanFile):
     url = "https://github.com/DavidAce/h5pp"
     license = "MIT"
     settings = "os", "compiler", "build_type", "arch"
-    generators = "cmake", "cmake_find_package", "cmake_find_package_multi"
-    requires = "eigen/3.4.0", "spdlog/1.9.2","fmt/8.0.1",  "hdf5/1.12.0"
+    generators = "cmake_find_package_multi"
+    requires = "eigen/3.4.0", "spdlog/1.9.2", "fmt/8.0.1",  "hdf5/1.12.0"
     build_policy    = "missing"
     scm = {
         "type": "git",

diff --git a/conanfile.txt b/conanfile.txt
@@ -1,6 +1,4 @@
-# Here you can specify desired software packages to be downloaded by conan.
-# To activate reading this file from CMakeLists.txt, enable the setting -DH5PP_DOWNLOAD_METHOD=conan
-
+# Here you can specify dependencies of h5pp to be downloaded by conan.
 
 [requires]
 eigen/3.4.0@
@@ -9,8 +7,6 @@ spdlog/1.9.2@
 hdf5/1.12.0@
 
 [generators]
-cmake
+cmake_find_package_multi
 
-[options]
-*:shared=False