mirror of
https://github.com/microsoft/vcpkg.git
synced 2026-01-18 01:11:23 +01:00
[liblsl] update to 1.17.4 (#49402)
This commit is contained in:
@@ -1,32 +1,33 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO sccn/liblsl
|
||||
REF v${VERSION}
|
||||
SHA512 141f364034a7156caf9ffafbb2f43cc9a932116a3ef1c1b76822649996d6b99b3017b18d91d9c25a9cd718419c5c3b037fa97b2845540bda195f55dd9de27ab1
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
use-find-package-asio.patch
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LSL_BUILD_STATIC)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DLSL_BUILD_STATIC=${LSL_BUILD_STATIC}
|
||||
-DLSL_BUNDLED_BOOST=OFF # we use the boost vcpkg packages instead
|
||||
-DLSL_BUNDLED_PUGIXML=OFF # we use the pugixml vcpkg package instead
|
||||
-Dlslgitrevision=v${VERSION}
|
||||
-Dlslgitbranch=master
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
vcpkg_copy_tools(TOOL_NAMES lslver AUTO_CLEAN)
|
||||
vcpkg_cmake_config_fixup(PACKAGE_NAME LSL CONFIG_PATH lib/cmake/LSL)
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO sccn/liblsl
|
||||
REF v${VERSION}
|
||||
SHA512 b50d2e276a6c824da5a19e517e3684b1f4c33fa31ed839772f33faa5756b19c934bc4f1587bb488819345549fa063533ad05d2ec41d2798f158150b4f4a48ff5
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
use-find-package-asio.patch
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LSL_BUILD_STATIC)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DLSL_BUILD_STATIC=${LSL_BUILD_STATIC}
|
||||
-DLSL_BUNDLED_BOOST=OFF # we use the boost vcpkg packages instead
|
||||
-DLSL_BUNDLED_PUGIXML=OFF # we use the pugixml vcpkg package instead
|
||||
-DLSL_FRAMEWORK=OFF
|
||||
-Dlslgitrevision=v${VERSION}
|
||||
-Dlslgitbranch=master
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
vcpkg_copy_tools(TOOL_NAMES lslver AUTO_CLEAN)
|
||||
vcpkg_cmake_config_fixup(PACKAGE_NAME LSL CONFIG_PATH lib/cmake/lsl)
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b47cb7f8..bd12f519 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -203,8 +203,9 @@ target_include_directories(lslobj
|
||||
target_include_directories(lslobj
|
||||
SYSTEM PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/thirdparty/loguru>
|
||||
- $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/thirdparty/asio>
|
||||
)
|
||||
+find_package(asio CONFIG REQUIRED)
|
||||
+target_link_libraries(lslobj PUBLIC asio::asio)
|
||||
target_compile_definitions(lslobj PRIVATE
|
||||
LIBLSL_EXPORTS
|
||||
LOGURU_DEBUG_LOGGING=$<BOOL:${LSL_DEBUGLOG}>
|
||||
diff --git a/cmake/TargetObjLib.cmake b/cmake/TargetObjLib.cmake
|
||||
index d974224..5e7795e 100644
|
||||
--- a/cmake/TargetObjLib.cmake
|
||||
+++ b/cmake/TargetObjLib.cmake
|
||||
@@ -65,8 +65,9 @@ target_include_directories(lslobj
|
||||
# Note: We use `PUBLIC` because 'internal tests' import individual source files and link lslobj.
|
||||
SYSTEM PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/loguru>
|
||||
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/asio>
|
||||
)
|
||||
+find_package(asio CONFIG REQUIRED)
|
||||
+target_link_libraries(lslobj PUBLIC asio::asio)
|
||||
if(NOT LSL_OPTIMIZATIONS)
|
||||
# build one object file for Asio instead of once every time an Asio function is called. See
|
||||
# https://think-async.com/Asio/asio-1.18.2/doc/asio/using.html#asio.using.optional_separate_compilation
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "liblsl",
|
||||
"version": "1.16.2",
|
||||
"version": "1.17.4",
|
||||
"description": "C++ lsl library for multi-modal time-synched data transmission over the local network",
|
||||
"homepage": "https://github.com/sccn/liblsl",
|
||||
"license": "MIT",
|
||||
|
||||
@@ -5097,7 +5097,7 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"liblsl": {
|
||||
"baseline": "1.16.2",
|
||||
"baseline": "1.17.4",
|
||||
"port-version": 0
|
||||
},
|
||||
"liblsquic": {
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "3f1884b94f2778c21afe3fc3767676fc239fcfc3",
|
||||
"version": "1.17.4",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "bc1c3d9c2142ad970d88c0a79f680b31c8d674f9",
|
||||
"version": "1.16.2",
|
||||
|
||||
Reference in New Issue
Block a user