(#14158) glaze: add version 0.1.7

* glaze: add version 0.1.7 * update fast_float
conan-io · Nov 18, 2022 · 3bf8c6b · 3bf8c6b
1 parent fc7fdca
commit 3bf8c6b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/recipes/glaze/all/conandata.yml b/recipes/glaze/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "0.1.7":
+    url: "https://github.com/stephenberry/glaze/archive/v0.1.7.tar.gz"
+    sha256: "7dc31ceaa444fd92339a48a69be638e92daa2858c3228f347b1df54a824b8f62"
   "0.1.4":
     url: "https://github.com/stephenberry/glaze/archive/v0.1.4.tar.gz"
     sha256: "dd46e77973fe5b3cf4cd68fd597ba6b1010ecffd3e10cd8ccbd6cd615e6ffaff"

diff --git a/recipes/glaze/all/conanfile.py b/recipes/glaze/all/conanfile.py
@@ -37,9 +37,11 @@ def layout(self):
 
     def requirements(self):
         self.requires("fmt/9.1.0")
-        self.requires("fast_float/3.6.0")
+        self.requires("fast_float/3.7.0")
         self.requires("frozen/1.1.1")
         self.requires("nanorange/20200505")
+        if Version(self.version) >= "0.1.5":
+            self.requires("dragonbox/1.1.3")
 
     def package_id(self):
         self.info.clear()
@@ -60,7 +62,6 @@ def loose_lt_semver(v1, v2):
                 f"{self.name} {self.version} requires C++{self._minimum_cpp_standard}, which your compiler does not support.",
             )
 
-
     def source(self):
         get(self, **self.conan_data["sources"][self.version], destination=self.source_folder, strip_root=True)
 

diff --git a/recipes/glaze/all/test_package/CMakeLists.txt b/recipes/glaze/all/test_package/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required(VERSION 3.12)
-
-project(test_package CXX)
+project(test_package LANGUAGES CXX)
 
 find_package(glaze REQUIRED CONFIG)
 

diff --git a/recipes/glaze/all/test_v1_package/CMakeLists.txt b/recipes/glaze/all/test_v1_package/CMakeLists.txt
@@ -1,12 +1,9 @@
 cmake_minimum_required(VERSION 3.12)
 
-project(test_package CXX)
+project(test_package)
 
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup(TARGETS)
 
-find_package(glaze REQUIRED CONFIG)
-
-add_executable(${PROJECT_NAME} ../test_package/test_package.cpp)
-target_link_libraries(${PROJECT_NAME} PRIVATE glaze::glaze)
-target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package/
+                 ${CMAKE_CURRENT_BINARY_DIR}/test_package/)
diff --git a/recipes/glaze/config.yml b/recipes/glaze/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "0.1.7":
+    folder: all
   "0.1.4":
     folder: all
   "0.1.3":