[Libcaer] Update to latest version (#25934)

* Libcaer update

* Libcaer portfile version update

* Updating head

* Libcaer version update

* Renaming references to avoid caching problems

* [libcaer] Version bump

* Removing redundant dash in version string

* [libcaer] version bump

* Fixing duplicate version

* Updating in regards to comments

* Add versions

Co-authored-by: Rokas Jurevicius <rokas.jurevicius@inivation.com>
This commit is contained in:
jureviciusr 2022-08-04 01:28:45 +03:00 committed by GitHub
parent 7122b74457
commit 14ce35f452
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 84 deletions

View File

@ -1,74 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b1937a..b9bc122 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,8 @@ OPTION(ENABLE_SERIALDEV "Enable support for serial port devices using libserialp
OPTION(ENABLE_OPENCV "Enable support for frame enhancements using OpenCV" OFF)
OPTION(UDEV_INSTALL "Install udev rules on Linux" ON)
OPTION(EXAMPLES_INSTALL "Build and install examples" OFF)
+OPTION(ENABLE_BINDIR_INSTALLATION "Split archive and binary installation targets [required for vcpkg installation]" OFF)
+OPTION(BUILD_SHARED_LIBS "Build libcaer as a shared library" ON)
# Cross-compile support
IF(NOT USER_LOCAL_PREFIX)
@@ -50,7 +52,7 @@ MESSAGE(STATUS "Base libraries: ${BASE_LIBS}")
INCLUDE(FindPkgConfig)
# Required: basic USB devices support
-IF(CC_MSVC)
+IF(ENABLE_BINDIR_INSTALLATION)
FIND_PACKAGE(libusb CONFIG REQUIRED)
ELSE()
PKG_CHECK_MODULES(
@@ -98,7 +100,7 @@ INCLUDE(CMakePackageConfigHelpers)
WRITE_BASIC_CONFIG_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake VERSION ${PROJECT_VERSION}
COMPATIBILITY SameMajorVersion)
SET(include_dirs ${CMAKE_INSTALL_INCLUDEDIR})
-IF(CC_MSVC)
+IF(ENABLE_BINDIR_INSTALLATION)
SET(export_destination ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME})
ELSE()
SET(export_destination ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 377a556..8461627 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,6 +19,10 @@ IF(NOT CC_MSVC)
SET(LIBCAER_COMPILE_OPTIONS "-Wno-unused-function")
ENDIF()
+IF(OS_MACOS)
+ LIST(APPEND LIBCAER_COMPILE_OPTIONS "-Wno-implicit-function-declaration")
+ENDIF()
+
SET(LIBCAER_LINK_LIBRARIES_PRIVATE ${BASE_LIBS})
IF(OS_LINUX)
@@ -54,6 +58,9 @@ ENDIF()
IF(CC_MSVC)
LIST(APPEND LIBCAER_SOURCES ../thirdparty/simple-stdatomic/stdatomic.c)
+ENDIF()
+
+IF(ENABLE_BINDIR_INSTALLATION)
INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIRS})
LIST(APPEND LIBCAER_LINK_LIBRARIES_PRIVATE ${LIBUSB_LIBRARIES})
ELSE()
@@ -63,7 +70,7 @@ ENDIF()
# Set full RPATH
SET(CMAKE_INSTALL_RPATH ${USER_LOCAL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-ADD_LIBRARY(caer SHARED ${LIBCAER_SOURCES})
+ADD_LIBRARY(caer ${LIBCAER_SOURCES})
IF(CC_MSVC)
# This flag needs to be propagated down to depending targets to avoid compilation errors
TARGET_COMPILE_OPTIONS(caer INTERFACE -DWIN32_LEAN_AND_MEAN=ON)
@@ -94,7 +101,7 @@ IF(ENABLE_STATIC)
SET_TARGET_PROPERTIES(caerStatic PROPERTIES OUTPUT_NAME caer)
- IF(OS_WINDOWS)
+ IF(ENABLE_BINDIR_INSTALLATION)
INSTALL(
TARGETS caerStatic
EXPORT libcaer-exports

View File

@ -2,11 +2,9 @@ vcpkg_from_gitlab(
GITLAB_URL https://gitlab.com/inivation/
OUT_SOURCE_PATH SOURCE_PATH
REPO dv/libcaer
REF 3.3.14
SHA512 6e91ebd20796b59c51ebb10be58d12577f3b6370425bbeffcf1a96ff91ad9f3ffaefb2741d0a932b241f2664c157d77158cf475b0f7e39ba208d5482f408fc8b
HEAD_REF ab9470e8900364822fb74ad3c1e99fa4088914df
PATCHES
libcaer-static-build.patch
REF 933dfa60a138091afb03014f8c24183bab7bba4e
SHA512 6e74e308833ca3c923b318a42bab30edb04f763cdd5b243701416b72278d7315fdd8a62ebb87b704212507f76c3e45bc9728df17ea2d1eab5133dfcf550c8c35
HEAD_REF master
)
vcpkg_cmake_configure(
@ -14,7 +12,7 @@ vcpkg_cmake_configure(
OPTIONS
-DENABLE_OPENCV=ON
-DEXAMPLES_INSTALL=OFF
-DENABLE_BINDIR_INSTALLATION=ON
-DBUILD_CONFIG_VCPKG=ON
)
vcpkg_cmake_install()

View File

@ -1,7 +1,6 @@
{
"name": "libcaer",
"version": "3.3.14",
"port-version": 1,
"version-date": "2022-07-25",
"description": "Minimal C library to access, configure and get data from neuromorphic sensors and processors.",
"homepage": "https://gitlab.com/inivation/dv/libcaer",
"license": "BSD-2-Clause",

View File

@ -3501,8 +3501,8 @@
"port-version": 1
},
"libcaer": {
"baseline": "3.3.14",
"port-version": 1
"baseline": "2022-07-25",
"port-version": 0
},
"libcanberra": {
"baseline": "0.30",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7b5ee918213a05dc43d5e7f3eb33b2961609c430",
"version-date": "2022-07-25",
"port-version": 0
},
{
"git-tree": "275713cf9dbdd13533fe379ad7f8c81fcf9a895c",
"version": "3.3.14",