Skip to content

Commit

Permalink
(conan-io#25311) libenvpp: add version 1.4.3
Browse files Browse the repository at this point in the history
* libenvpp: add version 1.4.2

* update 1.4.3
  • Loading branch information
toge authored and OMGtechy committed Dec 31, 2024
1 parent 26fbf36 commit 2fed421
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 3 deletions.
13 changes: 10 additions & 3 deletions recipes/libenvpp/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"1.4.3":
url: "https://github.com/ph3at/libenvpp/archive/refs/tags/v1.4.3.tar.gz"
sha256: "affbd735b6f47615a54c9159baef9de206cc85badb5af4f662669f3789a13fa8"
"1.4.1":
url: "https://github.com/ph3at/libenvpp/archive/refs/tags/v1.4.1.tar.gz"
sha256: "1bcd0a1eb4eef32a53cbb410ae38d708ea662e491cc5536cb9b15d54cc8b5707"
Expand All @@ -9,15 +12,19 @@ sources:
url: "https://github.com/ph3at/libenvpp/archive/refs/tags/v1.3.0.tar.gz"
sha256: "9201ae39dc67118ee46b4e60fe2e5d22b046faceae4a4b4eec6ab62bc48875dd"
patches:
"1.4.3":
- patch_file: "patches/1.4.3-0001-use-cci-fmt.patch"
patch_description: "use cci fmt package, remove static flag from add_library"
patch_type: "conan"
"1.4.1":
- patch_file: "patches/0001-use-cci-fmt.patch"
- patch_file: "patches/1.3.0-0001-use-cci-fmt.patch"
patch_description: "use cci fmt package, remove static flag from add_library"
patch_type: "conan"
"1.4.0":
- patch_file: "patches/0001-use-cci-fmt.patch"
- patch_file: "patches/1.3.0-0001-use-cci-fmt.patch"
patch_description: "use cci fmt package, remove static flag from add_library"
patch_type: "conan"
"1.3.0":
- patch_file: "patches/0001-use-cci-fmt.patch"
- patch_file: "patches/1.3.0-0001-use-cci-fmt.patch"
patch_description: "use cci fmt package, remove static flag from add_library"
patch_type: "conan"
31 changes: 31 additions & 0 deletions recipes/libenvpp/all/patches/1.4.3-0001-use-cci-fmt.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8aa4975..231e523 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,7 @@ endfunction()

# External dependencies.
include(FetchContent)
-
+if(0)
if(LIBENVPP_INSTALL)
set(FMT_INSTALL ON CACHE BOOL "" FORCE)
endif()
@@ -78,7 +78,8 @@ macro(fetch_content_from_submodule DEPNAME RELPATH)
endmacro()

fetch_content_from_submodule(fmt external/fmt)
-
+endif()
+find_package(fmt REQUIRED CONFIG)
if(LIBENVPP_TESTS)
fetch_content_from_submodule(Catch2 external/Catch2)
list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
@@ -144,6 +145,7 @@ endif()

# Installation target.
if(LIBENVPP_INSTALL)
+ include(CMakePackageConfigHelpers)
# Libenvpp installation.
set(LIBENVPP_PROJECT_CONFIG_OUT "${CMAKE_CURRENT_BINARY_DIR}/libenvpp-config.cmake")
set(LIBENVPP_VERSION_CONFIG_FILE "${CMAKE_CURRENT_BINARY_DIR}/libenvpp-config-version.cmake")
2 changes: 2 additions & 0 deletions recipes/libenvpp/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.4.3":
folder: all
"1.4.1":
folder: all
"1.4.0":
Expand Down

0 comments on commit 2fed421

Please sign in to comment.