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

qcbor: add new version 1.4.1 #24615

Merged
merged 7 commits into from
Aug 22, 2024
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
7 changes: 7 additions & 0 deletions recipes/qcbor/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"1.4":
url: "https://github.com/laurencelundblade/QCBOR/archive/refs/tags/v1.4.tar.gz"
sha256: "b8fd3813611ee14959ac815d4706c5e05123f149f05d0585761797896dd51e43"
"1.3":
url: "https://github.com/laurencelundblade/QCBOR/archive/refs/tags/v1.3.tar.gz"
sha256: "5acd3f3e7b19aad074813736a8776e71859d57c4dec9bfb85cd1dc6c219c8033"
Expand All @@ -12,6 +15,10 @@ sources:
url: "https://github.com/laurencelundblade/QCBOR/archive/refs/tags/v1.0.tar.gz"
sha256: "961a46eb5a599cc040bfce4f4fade4427e046f1748f37ba4ebbc097fb9cdf1d3"
patches:
"1.4":
- patch_file: "patches/1.4-0001-fix-cmake.patch"
patch_description: "disable fix fPIC and add installation"
patch_type: "conan"
"1.3":
- patch_file: "patches/1.2-0001-fix-cmake.patch"
patch_description: "disable fix fPIC and add installation"
Expand Down
1 change: 1 addition & 0 deletions recipes/qcbor/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ def source(self):

def generate(self):
tc = CMakeToolchain(self)
tc.variables["BUILD_QCBOR_TEST"] = False
if Version(self.version) >= "1.2":
tc.variables["QCBOR_OPT_DISABLE_FLOAT_HW_USE"] = self.options.disable_float in ["HW_USE", "PREFERRED", "ALL"]
tc.variables["QCBOR_OPT_DISABLE_FLOAT_PREFERRED"] = self.options.disable_float in ["PREFERRED", "ALL"]
Expand Down
30 changes: 30 additions & 0 deletions recipes/qcbor/all/patches/1.4-0001-fix-cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4aa83f..4878a31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,10 +58,14 @@ target_compile_definitions(qcbor
$<$<BOOL:${QCBOR_OPT_DISABLE_FLOAT_ALL}>:USEFULBUF_DISABLE_ALL_FLOAT>
)

-if (BUILD_SHARED_LIBS)
+if (0)
target_compile_options(qcbor PRIVATE -Os -fPIC)
endif()

+set_target_properties(qcbor PROPERTIES
+ WINDOWS_EXPORT_ALL_SYMBOLS ON
AbrilRBS marked this conversation as resolved.
Show resolved Hide resolved
+)
+
# The math library is needed for floating-point support.
# To avoid need for it #define QCBOR_DISABLE_FLOAT_HW_USE
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
@@ -88,6 +92,9 @@ set_target_properties(
include(GNUInstallDirs)
install(
TARGETS qcbor
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/qcbor"
AbrilRBS marked this conversation as resolved.
Show resolved Hide resolved
)

2 changes: 2 additions & 0 deletions recipes/qcbor/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.4":
folder: all
"1.3":
folder: all
"1.2":
Expand Down
Loading