Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

glaze: add version 0.1.7 #14158

Merged
merged 2 commits into from
Nov 18, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions recipes/glaze/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 2 additions & 1 deletion recipes/glaze/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ def requirements(self):
self.requires("fast_float/3.6.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()
Expand All @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions recipes/glaze/all/test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
cmake_minimum_required(VERSION 3.12)

project(test_package CXX)
project(test_package LANGUAGES CXX)

find_package(glaze REQUIRED CONFIG)

Expand Down
9 changes: 3 additions & 6 deletions recipes/glaze/all/test_v1_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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/)
2 changes: 2 additions & 0 deletions recipes/glaze/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"0.1.7":
folder: all
"0.1.4":
folder: all
"0.1.3":
Expand Down