[liblsl] Update liblsl port to 1.13.0-b6 (#6745)

This commit is contained in:
chausner 2019-06-04 11:18:26 +02:00 committed by Robert Schumacher
parent c5dbc68a38
commit 3ab376957a
4 changed files with 4 additions and 49 deletions

View File

@ -1,3 +1,3 @@
Source: liblsl
Version: 1.13.0-b4
Version: 1.13.0-b6
Description: C++ lsl library for multi-modal time-synched data transmission over the local network

View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5832a0e6..497dacd1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,7 +170,7 @@ endif()
install(TARGETS lsl
COMPONENT liblsl
EXPORT "${PROJECT_NAME}Config"
- RUNTIME DESTINATION ${LSLPREFIX}lib
+ RUNTIME DESTINATION ${LSLPREFIX}bin
LIBRARY DESTINATION ${LSLPREFIX}lib
INCLUDES DESTINATION ${LSLPREFIX}include
ARCHIVE DESTINATION ${LSLPREFIX}lib

View File

@ -1,31 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73e4a7a0..0f8e19f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,26 +106,6 @@ if(LSL_NO_FANCY_LIBNAME)
set(CMAKE_DEBUG_POSTFIX "")
endif()
-# try to find out which revision is currently checked out
-find_package(Git)
-if(GIT_FOUND)
- execute_process(
- COMMAND ${GIT_EXECUTABLE} describe --tags HEAD
- WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
- OUTPUT_VARIABLE lslgitrevision
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
- execute_process(
- COMMAND ${GIT_EXECUTABLE} rev-parse --symbolic-full-name --abbrev-ref @
- WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
- OUTPUT_VARIABLE lslgitbranch
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
- message(STATUS "Git version information: ${lslgitbranch}/${lslgitrevision}")
-else()
- set(lslgitrevision "unknown")
- set(lslgitbranch "unknown")
-endif()
set(LSL_VERSION_INFO "\"git:${lslgitrevision}/branch:${lslgitbranch}/build:${CMAKE_BUILD_TYPE}/compiler:${CMAKE_CXX_COMPILER_ID}-${CMAKE_CXX_COMPILER_VERSION}/boost:\" BOOST_LIB_VERSION")
set_source_files_properties("src/lsl_freefuncs_c.cpp" PROPERTIES COMPILE_DEFINITIONS LSL_LIBRARY_INFO_STR=${LSL_VERSION_INFO})

View File

@ -5,10 +5,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO sccn/liblsl
REF v1.13.0-b4 # NOTE: when updating version, also change it in the parameter to vcpkg_configure_cmake
SHA512 19bc587afcff315385e7bab1f88cf4edd315acfda61a630b23ffe4c59bc0f5aa570f0a979071f2b60009bb4d4b8ce08c98c414dc5b88042556b2501f4b8dcb79
REF 1.13.0-b6 # NOTE: when updating version, also change it in the parameter to vcpkg_configure_cmake
SHA512 fb98cdd73de5f13e97f639ba3f2f836d46ce28cdcb2246584728f296eb647e2c9c069534470a603b10d7dc34ab8978bf246e2187428ab231a925feb0b7024c89
HEAD_REF master
PATCHES hardcode-version.patch fix-runtime-destination.patch
)
vcpkg_configure_cmake(
@ -18,7 +17,7 @@ vcpkg_configure_cmake(
-DLSL_BUILD_STATIC=OFF
-DLSL_UNIXFOLDERS=ON
-DLSL_NO_FANCY_LIBNAME=ON
-Dlslgitrevision="v1.13.0-b4"
-Dlslgitrevision="1.13.0-b6"
-Dlslgitbranch="master"
)