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.

Sign up for GitHub

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

Jump to bottom

libenvpp: add version 1.4.2 #25311

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+45 −3
Open

libenvpp: add version 1.4.2 #25311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions recipes/libenvpp/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"1.4.2":
url: "https://github.com/ph3at/libenvpp/archive/refs/tags/v1.4.2.tar.gz"
sha256: "14b2e14112036b15c7fc2d7e566ee6b2de9c2c55091e8d3de194ebed19f6fc34"
"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.2":
- patch_file: "patches/1.4.2-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"
0 ...benvpp/all/patches/0001-use-cci-fmt.patch → .../all/patches/1.3.0-0001-use-cci-fmt.patch
View file
Open in desktop
File renamed without changes.
33 changes: 33 additions & 0 deletions recipes/libenvpp/all/patches/1.4.2-0001-use-cci-fmt.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e7f0ff..fd1cee8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,7 @@ function(libenvpp_set_compiler_parameters TARGET)
endfunction()

# External dependencies.
+if(0)
if(LIBENVPP_INSTALL)
set(FMT_INSTALL ON CACHE BOOL "" FORCE)
endif()
@@ -63,7 +64,8 @@ FetchContent_Declare(fmt
GIT_TAG 11.0.2
)
FetchContent_MakeAvailable(fmt)
-
+endif()
+find_package(fmt REQUIRED CONFIG)
if(LIBENVPP_TESTS)
FetchContent_Declare(Catch2
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
@@ -133,7 +135,9 @@ endif()

# Installation target.
if(LIBENVPP_INSTALL)
- # Libenvpp installation.
+ 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")
install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
2 changes: 2 additions & 0 deletions recipes/libenvpp/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.4.2":
folder: all
"1.4.1":
folder: all
"1.4.0":
Expand Down
Loading