(#22079) prometheus-cpp: add new version 1.2.4, require C++11 only

* prometheus: add version 1.2.0 * update 1.2.1 * update 1.2.3 * update 1.2.4 * check C++11 only instead of C++14 * require C++14 only on 1.1.0 * invert condition
conan-io · Sep 10, 2024 · 20d8ac3 · 20d8ac3
1 parent abaca04
commit 20d8ac3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 19 deletions.
diff --git a/recipes/prometheus-cpp/all/conandata.yml b/recipes/prometheus-cpp/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "1.2.4":
+    url: "https://github.com/jupp0r/prometheus-cpp/archive/v1.2.4.tar.gz"
+    sha256: "48dbad454d314b836cc667ec4def93ec4a6e4255fc8387c20cacb3b8b6faee30"
   "1.1.0":
     url: "https://github.com/jupp0r/prometheus-cpp/archive/v1.1.0.tar.gz"
     sha256: "397544fe91e183029120b4eebcfab24ed9ec833d15850aae78fd5db19062d13a"

diff --git a/recipes/prometheus-cpp/all/conanfile.py b/recipes/prometheus-cpp/all/conanfile.py
@@ -4,7 +4,6 @@
 from conan.tools.build import check_min_cppstd, valid_min_cppstd
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
 from conan.tools.scm import Version
-from conan.tools.microsoft import is_msvc, check_min_vs
 
 import os
 
@@ -36,15 +35,19 @@ class PrometheusCppConan(ConanFile):
 
     @property
     def _min_cppstd(self):
-        return 11 if Version(self.version) < "1.1.0" else 14
+        return "14" if Version(self.version) == "1.1.0" else "11"
 
     @property
     def _compilers_minimum_version(self):
         return {
-            "gcc": "7",
-            "clang": "7",
-            "apple-clang": "10",
-        }
+            "14": {
+                "gcc": "7",
+                "clang": "7",
+                "apple-clang": "10",
+                "Visual Studio": "15",
+                "msvc": "191",
+            },
+        }.get(self._min_cppstd, {})
 
     def export_sources(self):
         export_conandata_patches(self)
@@ -73,18 +76,14 @@ def requirements(self):
     def validate(self):
         if self.info.settings.compiler.cppstd:
             check_min_cppstd(self, self._min_cppstd)
-        if Version(self.version) < "1.1.0":
-            return
-        check_min_vs(self, 191)
-        if not is_msvc(self):
-            minimum_version = self._compilers_minimum_version.get(str(self.info.settings.compiler), False)
-            if minimum_version and Version(self.info.settings.compiler.version) < minimum_version:
-                raise ConanInvalidConfiguration(
-                    f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support."
-                )
+        minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False)
+        if minimum_version and Version(self.settings.compiler.version) < minimum_version:
+            raise ConanInvalidConfiguration(
+                f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support."
+            )
 
     def source(self):
-        get(self, **self.conan_data["sources"][self.version], destination=self.source_folder, strip_root=True)
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
     def generate(self):
         tc = CMakeToolchain(self)

diff --git a/recipes/prometheus-cpp/all/test_package/CMakeLists.txt b/recipes/prometheus-cpp/all/test_package/CMakeLists.txt
@@ -5,8 +5,8 @@ find_package(prometheus-cpp CONFIG REQUIRED)
 
 add_executable(${PROJECT_NAME} test_package.cpp)
 target_link_libraries(${PROJECT_NAME} PRIVATE prometheus-cpp::push prometheus-cpp::pull)
-if(${prometheus-cpp_VERSION} VERSION_LESS "1.1.0")
-    target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)
-else()
+if(${prometheus-cpp_VERSION} VERSION_EQUAL "1.1.0")
     target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14)
+else()
+    target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)
 endif()
diff --git a/recipes/prometheus-cpp/config.yml b/recipes/prometheus-cpp/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "1.2.4":
+    folder: all
   "1.1.0":
     folder: all
   "1.0.1":