Skip to content

Commit

Permalink
Fix boost version
Browse files Browse the repository at this point in the history
  • Loading branch information
Maxhy committed Jan 8, 2024
1 parent 90432f4 commit 24d537f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[Download binaries](https://github.com/liblogicalaccess/liblogicalaccess/releases) |
[Issue-Tracker](https://github.com/liblogicalaccess/liblogicalaccess/issues)

Welcome to the LibLogicalAccess project web page, an open source RFID library developed in C++ for Linux / Windows, also available on C#, Delphi, WinDev… for who are using the Microsoft operating system (using a COM wrapper).
Welcome to the LibLogicalAccess project web page, an open source RFID library developed in C++ for Linux / Windows, also available on .NET C# with a [SWIG wrapper](https://github.com/liblogicalaccess/liblogicalaccess-swig).


* Stable branch: master [![Build Status](https://github.com/liblogicalaccess/liblogicalaccess/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/liblogicalaccess/liblogicalaccess/actions/workflows/build.yml)
Expand Down
4 changes: 2 additions & 2 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class LLAConan(ConanFile):
url = "https://github.com/liblogicalaccess/liblogicalaccess"
description = "LLA RFID library"
settings = "os", "compiler", "build_type", "arch"
requires = 'boost/1.84.0', 'openssl/1.1.1w', 'nlohmann_json/3.11.3', 'zlib/1.3'
requires = 'boost/1.83.0', 'openssl/1.1.1w', 'nlohmann_json/3.11.3', 'zlib/1.3'
generators = "cmake"
options = {'LLA_BUILD_PKCS': [True, False],
'LLA_BUILD_UNITTEST': [True, False],
Expand Down Expand Up @@ -35,7 +35,7 @@ class LLAConan(ConanFile):

def requirements(self):
if self.options.LLA_BUILD_UNITTEST:
self.requires('gtest/1.11.0')
self.requires('gtest/1.14.0')
if self.options.LLA_BUILD_PKCS:
self.requires('cppkcs11/1.1')
if self.options.LLA_BUILD_LIBUSB:
Expand Down
9 changes: 1 addition & 8 deletions documentations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,9 @@
<groupId>eu.islog.lib.readers</groupId>
<artifactId>liblogicalaccess-doc</artifactId>
<packaging>pom</packaging>
<version>2.5.0</version>
<version>3.0.0</version>
<name>LibLogicalaccess Documentation</name>

<distributionManagement>
<repository>
<id>rfid-releases</id>
<url>http://artifacts.islog.com/repository/rfid-releases</url>
</repository>
</distributionManagement>

<properties>
<scmUrl>scm:git:https://github.com/liblogicalaccess/liblogicalaccess.git</scmUrl>
<relativeScmPath />
Expand Down

0 comments on commit 24d537f

Please sign in to comment.