From 8cf2067e571a070d6847c2bddb5d0f0a55934609 Mon Sep 17 00:00:00 2001 From: Ehsan Date: Wed, 28 Aug 2019 01:39:47 +0430 Subject: [PATCH] [liblsl] Update library to 1.13.0-b11 (#7906) * [liblsl] Update library to 1.13.0-b11 * Remove additional comments * Change version in vcpkg_configure_cmake --- ports/liblsl/CONTROL | 2 +- ports/liblsl/fix-install.patch | 13 +++++++++++++ ports/liblsl/portfile.cmake | 11 +++++++---- 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 ports/liblsl/fix-install.patch diff --git a/ports/liblsl/CONTROL b/ports/liblsl/CONTROL index 995b9fbd6..924dd3236 100644 --- a/ports/liblsl/CONTROL +++ b/ports/liblsl/CONTROL @@ -1,3 +1,3 @@ Source: liblsl -Version: 1.13.0-b6 +Version: 1.13.0-b11-1 Description: C++ lsl library for multi-modal time-synched data transmission over the local network diff --git a/ports/liblsl/fix-install.patch b/ports/liblsl/fix-install.patch new file mode 100644 index 000000000..66bfe0b18 --- /dev/null +++ b/ports/liblsl/fix-install.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6f2b0ff..c22360f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -184,7 +184,7 @@ else() + set(LSLPREFIX "LSL/") + endif() + +-add_executable(lslver testing/lslver.c) ++add_library(lslver STATIC testing/lslver.c) + target_link_libraries(lslver PRIVATE lsl) + + install(TARGETS lsl lslver diff --git a/ports/liblsl/portfile.cmake b/ports/liblsl/portfile.cmake index 1b6890a14..8009f37de 100644 --- a/ports/liblsl/portfile.cmake +++ b/ports/liblsl/portfile.cmake @@ -1,13 +1,15 @@ include(vcpkg_common_functions) -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +set(VCPKG_LIBRARY_LINKAGE dynamic) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sccn/liblsl - REF 1.13.0-b6 # NOTE: when updating version, also change it in the parameter to vcpkg_configure_cmake - SHA512 fb98cdd73de5f13e97f639ba3f2f836d46ce28cdcb2246584728f296eb647e2c9c069534470a603b10d7dc34ab8978bf246e2187428ab231a925feb0b7024c89 + REF 1.13.0-b11 # NOTE: when updating version, also change it in the parameter to vcpkg_configure_cmake + SHA512 212f28070b8239dc176d2e35bf4091896babbf7688e4cbe1c2bb0c3788f317ce2a80f92d4b008c6e577b01a09e8faf65228d396ff13e9ade0c1ffdc5e08cb9e5 HEAD_REF master + PATCHES + fix-install.patch ) vcpkg_configure_cmake( @@ -17,7 +19,7 @@ vcpkg_configure_cmake( -DLSL_BUILD_STATIC=OFF -DLSL_UNIXFOLDERS=ON -DLSL_NO_FANCY_LIBNAME=ON - -Dlslgitrevision="1.13.0-b6" + -Dlslgitrevision="1.13.0-b11" -Dlslgitbranch="master" ) @@ -26,5 +28,6 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblsl RENAME copyright) file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblsl)